Skip to content

Commit 9f015aa

Browse files
lukeblevinslukeblevins
committed
Improvements to Themes
1 parent 5444a2f commit 9f015aa

File tree

6 files changed

+19
-45
lines changed

6 files changed

+19
-45
lines changed

‎Files UWP/App.xaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,14 @@
88
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
99
<ResourceDictionary>
1010
<ResourceDictionary.ThemeDictionaries>
11-
<ResourceDictionary x:Key="Default">
12-
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" FallbackColor="#eaeaea" TintColor="LightSlateGray" TintOpacity="0.6"/>
13-
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
14-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
15-
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
16-
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
17-
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
18-
</ResourceDictionary>
1911
<ResourceDictionary x:Key="Light">
2012
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
2113
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
2214
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
2315
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
2416
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
2517
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
18+
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="DarkGray"/>
2619
</ResourceDictionary>
2720
<ResourceDictionary x:Key="Dark">
2821
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
@@ -32,6 +25,11 @@
3225
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
3326
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="Black"/>
3427
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="White"/>
28+
<SolidColorBrush x:Key="TabViewBackground" Color="Black"/>
29+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="#191919"/>
30+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="#191919" />
31+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919"/>
32+
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="#FF363636"/>
3533
</ResourceDictionary>
3634
<ResourceDictionary x:Key="HighContrast">
3735
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->

‎Files UWP/FilesUWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
<Version>5.1.0</Version>
322322
</PackageReference>
323323
<PackageReference Include="Microsoft.UI.Xaml">
324-
<Version>2.2.190830001</Version>
324+
<Version>2.2.190917002</Version>
325325
</PackageReference>
326326
</ItemGroup>
327327
<ItemGroup>

‎Files UWP/GenericFileBrowser.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
<controls:DataGrid.Resources>
181181
<SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent"/>
182182
<SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent"/>
183+
<StaticResource x:Key="DataGridColumnHeaderBackgroundColor" ResourceKey="ApplicationPageBackgroundThemeBrush"/>
183184
</controls:DataGrid.Resources>
184185
<controls:DataGrid.ColumnHeaderStyle>
185186
<Style TargetType="controlsprimitives:DataGridColumnHeader">

‎Files UWP/InstanceTabsView.xaml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<KeyboardAccelerator Modifiers="Control" Key="T"/>
102102
</Button.KeyboardAccelerators>
103103
</Button>
104-
104+
105105
<Grid Background="Transparent" Name="DragArea" Loaded="DragArea_Loaded" Grid.Column="3"/>
106106

107107
</Grid>
@@ -113,7 +113,7 @@
113113
</Style>
114114
</Page.Resources>
115115

116-
<Grid Background="{StaticResource SystemControlAcrylicWindowBrush}" Name="rootGrid" >
116+
<Grid Background="Transparent" Name="rootGrid" >
117117
<Grid.RowDefinitions>
118118
<RowDefinition Height="Auto"/>
119119
<RowDefinition Height="*"/>
@@ -124,34 +124,9 @@
124124
</Grid.ColumnDefinitions>
125125
<ContentPresenter Background="{StaticResource ApplicationPageBackgroundThemeBrush}" x:Name="ContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" Content="{x:Bind ((uilib:TabViewItem)(local:InstanceTabsView).TabStrip.SelectedItem).Content, Mode=OneWay}"/>
126126

127-
<uilib:TabView Background="Transparent" Grid.Row="0" AddTabButtonClick="TabStrip_AddTabButtonClick" Style="{StaticResource TabViewStyleFixed}" SelectionChanged="TabStrip_SelectionChanged" TabCloseRequested="TabStrip_TabCloseRequested" Name="TabStrip" TabWidthMode="Equal" VerticalAlignment="Stretch">
128-
<uilib:TabView.Resources>
129-
<ResourceDictionary>
130-
<ResourceDictionary.ThemeDictionaries>
131-
<ResourceDictionary x:Key="Default">
132-
<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemControlBackgroundAltHighBrush" />
133-
<StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
134-
<StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
135-
</ResourceDictionary>
136-
<ResourceDictionary x:Key="Light">
137-
<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemControlBackgroundAltHighBrush" />
138-
<StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
139-
<StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
140-
</ResourceDictionary>
141-
<ResourceDictionary x:Key="Dark">
142-
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="#191919" />
143-
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="#191919" />
144-
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919" />
145-
</ResourceDictionary>
146-
<ResourceDictionary x:Key="HighContrast">
147-
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
148-
</ResourceDictionary>
149-
</ResourceDictionary.ThemeDictionaries>
150-
</ResourceDictionary>
151-
<!--<x:Double x:Key="TabViewItemHeaderMinHeight">32</x:Double>
152-
<StaticResource x:Key="TabViewSelectionIndicatorForeground" ResourceKey="SystemControlTransparentBrush" />-->
153-
</uilib:TabView.Resources>
127+
<uilib:TabView Grid.Row="0" AddTabButtonClick="TabStrip_AddTabButtonClick" Style="{ThemeResource TabViewStyleFixed}" SelectionChanged="TabStrip_SelectionChanged" TabCloseRequested="TabStrip_TabCloseRequested" Name="TabStrip" TabWidthMode="Equal" VerticalAlignment="Stretch">
128+
154129
</uilib:TabView>
155-
130+
<Grid Grid.Column="1" Background="{ThemeResource TabViewBackground}"/>
156131
</Grid>
157132
</Page>

‎Files UWP/InstanceTabsView.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public InstanceTabsView()
3535
titleBar.ButtonBackgroundColor = Color.FromArgb(0, 0, 0, 0);
3636
titleBar.ButtonForegroundColor = Colors.White;
3737
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 240, 240, 240);
38-
titleBar.BackgroundColor = Color.FromArgb(255, 25, 25, 25);
38+
//titleBar.BackgroundColor = Color.FromArgb(255, 25, 25, 25);
3939
}
4040
else if (App.Current.RequestedTheme == ApplicationTheme.Light)
4141
{
@@ -48,13 +48,13 @@ public InstanceTabsView()
4848
{
4949
titleBar.ButtonForegroundColor = Colors.White;
5050
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 240, 240, 240);
51-
titleBar.BackgroundColor = Color.FromArgb(255, 25, 25, 25);
51+
//titleBar.BackgroundColor = Color.FromArgb(255, 25, 25, 25);
5252
}
5353
else if (this.RequestedTheme == ElementTheme.Light)
5454
{
5555
titleBar.ButtonForegroundColor = Colors.Black;
5656
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 155, 155, 155);
57-
titleBar.BackgroundColor = Colors.Transparent;
57+
//titleBar.BackgroundColor = Colors.Transparent;
5858
}
5959
AddNewTab(typeof(ProHome), "Start");
6060
Microsoft.UI.Xaml.Controls.FontIconSource icon = new Microsoft.UI.Xaml.Controls.FontIconSource();

‎Files UWP/ProHome.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,8 @@
814814
</Button>
815815
</StackPanel>
816816
<Grid Padding="5,5,5,5.5" Grid.Column="1">
817-
<TextBox LostFocus="VisiblePath_LostFocus" FocusDisengaged="VisiblePath_LostFocus" Visibility="Collapsed" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Text="{x:Bind PathText.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Windows10version1809:CornerRadius="2" KeyDown="VisiblePath_TextChanged" Style="{StaticResource TextBoxStyleForPathBar}" BorderThickness="1" x:Name="VisiblePath" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Padding="4" PlaceholderText="Enter a path"/>
818-
<Grid Background="Transparent" Padding="2.5,0,0,0" PointerPressed="ManualPathEntryItem_Click" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Windows10version1809:CornerRadius="2" BorderThickness="1" x:Name="ClickablePath" VerticalAlignment="Stretch">
817+
<TextBox LostFocus="VisiblePath_LostFocus" FocusDisengaged="VisiblePath_LostFocus" Visibility="Collapsed" HorizontalAlignment="Stretch" BorderBrush="{ThemeResource CustomInputFieldBorderBrush}" Text="{x:Bind PathText.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Windows10version1809:CornerRadius="2" KeyDown="VisiblePath_TextChanged" Style="{StaticResource TextBoxStyleForPathBar}" BorderThickness="1" x:Name="VisiblePath" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Padding="4" PlaceholderText="Enter a path"/>
818+
<Grid Background="Transparent" Padding="2.5,0,0,0" PointerPressed="ManualPathEntryItem_Click" HorizontalAlignment="Stretch" BorderBrush="{ThemeResource CustomInputFieldBorderBrush}" Windows10version1809:CornerRadius="2" BorderThickness="1" x:Name="ClickablePath" VerticalAlignment="Stretch">
819819
<Grid.ContextFlyout>
820820
<MenuFlyout>
821821
<MenuFlyoutItem x:Name="ManualPathEntryItem" Text="Edit address" Icon="Edit" Click="ManualPathEntryItem_Click"/>
@@ -852,7 +852,7 @@
852852
</Grid>
853853

854854
<StackPanel x:Name="SearchReigon" Margin="0,5,5,5" Grid.Column="2" Orientation="Horizontal">
855-
<TextBox BorderBrush="DarkGray" Name="SearchBox" Style="{StaticResource TextBoxStyleForPathBar}" Padding="5" Windows10version1809:CornerRadius="2,0,0,2" BorderThickness="1" VerticalAlignment="Stretch" PlaceholderText="Search" Width="260">
855+
<TextBox BorderBrush="{ThemeResource CustomInputFieldBorderBrush}" Name="SearchBox" Style="{StaticResource TextBoxStyleForPathBar}" Padding="5" Windows10version1809:CornerRadius="2,0,0,2" BorderThickness="1" VerticalAlignment="Stretch" PlaceholderText="Search" Width="260">
856856
<TextBox.KeyboardAccelerators>
857857
<KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="F"/>
858858
</TextBox.KeyboardAccelerators>

0 commit comments

Comments
 (0)