Skip to content

Commit 3cb8d9c

Browse files
author
Yair Aichenbaum
committed
Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop
2 parents d90db75 + 653d6f4 commit 3cb8d9c

File tree

3 files changed

+57
-3
lines changed

3 files changed

+57
-3
lines changed

Files/UserControls/NavigationToolbar/ModernNavigationToolbar.xaml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@
648648
VerticalAlignment="Stretch"
649649
HorizontalContentAlignment="Stretch"
650650
VerticalContentAlignment="Stretch"
651-
Background="{ThemeResource TextControlBackground}"
651+
Background="Transparent"
652652
CanReorderItems="False"
653653
IsItemClickEnabled="True"
654654
ItemClick="PathViewInteract_ItemClick"
@@ -676,6 +676,35 @@
676676
Grid.Row="2"
677677
HorizontalAlignment="Right"
678678
Orientation="Horizontal">
679+
680+
<Button
681+
Grid.Row="3"
682+
Margin="0,0,4,0"
683+
HorizontalAlignment="Right"
684+
Background="Transparent"
685+
FontFamily="Segoe MDL2 Assets"
686+
Visibility="Visible">
687+
<Button.Content>
688+
<FontIcon FontSize="14" Glyph="&#xE710;"/>
689+
</Button.Content>
690+
691+
692+
</Button>
693+
694+
<Button
695+
Grid.Row="3"
696+
Margin="0,0,4,0"
697+
HorizontalAlignment="Right"
698+
Background="Transparent"
699+
FontFamily="Segoe MDL2 Assets"
700+
Visibility="Visible">
701+
<Button.Content>
702+
<FontIcon FontSize="14" Glyph="&#xE721;"/>
703+
</Button.Content>
704+
705+
706+
</Button>
707+
679708
<AutoSuggestBox
680709
x:Name="SearchReigon"
681710
Grid.Row="2"
@@ -701,8 +730,10 @@
701730
<MenuFlyout Placement="BottomEdgeAlignedRight">
702731
<MenuFlyoutItem x:Uid="NavigationToolbarNewTab" Text="New Tab" />
703732
<MenuFlyoutItem Text="New Window" />
733+
<MenuFlyoutItem Text="Copy Path" />
704734
<MenuFlyoutSeparator />
705-
<MenuFlyoutItem Text="Settings" />
735+
<MenuFlyoutItem Text="Paste" />
736+
<MenuFlyoutItem Text="Open in Terminal..." />
706737
</MenuFlyout>
707738
</Button.Flyout>
708739

Files/Views/InstanceTabsView.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
TabCloseRequested="TabStrip_TabCloseRequested"
2222
TabWidthMode="Equal">
2323
<muxc:TabView.Resources>
24-
<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="RibbonBackgroundColor" />
24+
<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ApplicationPageBackgroundThemeBrush" />
2525
<Thickness x:Key="TabViewHeaderPadding">0,0,0,0</Thickness>
2626
</muxc:TabView.Resources>
2727
<muxc:TabView.TabStripHeader>
@@ -49,6 +49,9 @@
4949
<Button.Content>
5050
<FontIcon FontSize="10" Glyph="&#xE710;" />
5151
</Button.Content>
52+
<Button.KeyboardAccelerators>
53+
<KeyboardAccelerator Modifiers="Control" Key="T"/>
54+
</Button.KeyboardAccelerators>
5255
</Button>
5356
<Grid
5457
x:Name="DragArea"

Files/Views/Pages/Settings.xaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,26 @@
2222
PaneDisplayMode="Top"
2323
PaneTitle="Settings"
2424
SelectionChanged="SettingsPane_SelectionChanged">
25+
<muxc:NavigationView.Resources>
26+
<ResourceDictionary>
27+
<ResourceDictionary.ThemeDictionaries>
28+
<ResourceDictionary x:Key="Light">
29+
<StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
30+
<StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
31+
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
32+
</ResourceDictionary>
33+
<ResourceDictionary x:Key="Dark">
34+
<StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
35+
<StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
36+
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="ApplicationPageBackgroundThemeBrush" />
37+
</ResourceDictionary>
38+
<ResourceDictionary x:Key="HighContrast">
39+
40+
</ResourceDictionary>
41+
</ResourceDictionary.ThemeDictionaries>
42+
</ResourceDictionary>
43+
</muxc:NavigationView.Resources>
44+
2545
<muxc:NavigationView.AutoSuggestBox>
2646
<AutoSuggestBox
2747
x:Uid="SettingsNavSearch"

0 commit comments

Comments
 (0)