Skip to content

Commit ee6f2c5

Browse files
authored
Feature: Improved support for theming (#10863)
1 parent e1a01fc commit ee6f2c5

File tree

16 files changed

+598
-132
lines changed

16 files changed

+598
-132
lines changed

src/Files.App/App.xaml

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,75 +19,69 @@
1919
<SolidColorBrush x:Key="WindowCaptionBackground" Color="Transparent" />
2020
<SolidColorBrush x:Key="WindowCaptionBackgroundDisabled" Color="Transparent" />
2121

22+
<!-- Removes NavigationView background -->
23+
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
24+
25+
<!-- Removes NavigationView corner radius -->
26+
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
27+
28+
<!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/5441 -->
29+
<x:Double x:Key="MediaTransportControlsMinWidth">50</x:Double>
30+
31+
<!-- Workaround for an issue where the shadow was showing on the tab control -->
32+
<x:Double x:Key="TabViewShadowDepth">0</x:Double>
33+
34+
<CornerRadius x:Key="GridViewThumbnailCornerRadius">2</CornerRadius>
35+
<CornerRadius x:Key="DetailsLayoutThumbnailCornerRadius">2</CornerRadius>
36+
37+
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
38+
<LinearGradientBrush.RelativeTransform>
39+
<ScaleTransform CenterY="0.5" ScaleY="-1" />
40+
</LinearGradientBrush.RelativeTransform>
41+
<LinearGradientBrush.GradientStops>
42+
<GradientStop Offset="0" Color="{ThemeResource ControlStrokeColorSecondary}" />
43+
<GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" />
44+
</LinearGradientBrush.GradientStops>
45+
</LinearGradientBrush>
46+
2247
<ResourceDictionary.MergedDictionaries>
2348
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
2449
<ResourceDictionary>
2550
<ResourceDictionary.ThemeDictionaries>
2651
<ResourceDictionary x:Key="Light">
52+
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
53+
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
54+
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
55+
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
56+
2757
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
2858
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
2959
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
3060
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
31-
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
32-
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
33-
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
34-
<SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
35-
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />
36-
<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />
37-
<StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="CardBackgroundFillColorDefault" />
38-
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
39-
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
4061
</ResourceDictionary>
4162
<ResourceDictionary x:Key="Dark">
63+
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
64+
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
65+
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="#993A3A3A" />
66+
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#993A3A3A" />
67+
4268
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
4369
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
4470
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
4571
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
46-
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
47-
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
48-
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
49-
<SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
50-
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />
51-
<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />
52-
<SolidColorBrush x:Key="SidebarContentBackgroundBrush" Color="#993A3A3A" />
53-
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
54-
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
5572
</ResourceDictionary>
5673
<ResourceDictionary x:Key="HighContrast">
74+
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
75+
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="Transparent" />
76+
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
77+
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
78+
5779
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
5880
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
5981
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
6082
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
61-
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource SystemColorGrayTextColor}" />
62-
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
63-
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
64-
<SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="Transparent" />
65-
<StaticResource x:Key="FileBrowserHeaderBackgroundBrush" ResourceKey="SolidBackgroundFillColorBaseBrush" />
66-
<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />
67-
<StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="CardBackgroundFillColorDefault" />
68-
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
69-
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="#0F000000" />
7083
</ResourceDictionary>
7184
</ResourceDictionary.ThemeDictionaries>
72-
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
73-
<LinearGradientBrush.RelativeTransform>
74-
<ScaleTransform CenterY="0.5" ScaleY="-1" />
75-
</LinearGradientBrush.RelativeTransform>
76-
<LinearGradientBrush.GradientStops>
77-
<GradientStop Offset="0" Color="{ThemeResource ControlStrokeColorSecondary}" />
78-
<GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" />
79-
</LinearGradientBrush.GradientStops>
80-
</LinearGradientBrush>
81-
82-
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
83-
<CornerRadius x:Key="GridViewThumbnailCornerRadius">2</CornerRadius>
84-
<CornerRadius x:Key="DetailsLayoutThumbnailCornerRadius">2</CornerRadius>
85-
86-
<!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/5441 -->
87-
<x:Double x:Key="MediaTransportControlsMinWidth">50</x:Double>
88-
89-
<!-- Workaround for an issue where the shadow was showing on the tab control -->
90-
<x:Double x:Key="TabViewShadowDepth">0</x:Double>
9185
</ResourceDictionary>
9286
</ResourceDictionary.MergedDictionaries>
9387
</ResourceDictionary>

src/Files.App/Helpers/AppThemeResourcesHelper.cs

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,51 @@ public void ApplyResources()
2323
}
2424

2525
/// <summary>
26-
/// Overrides the xaml resource for RootBackgroundBrush
26+
/// Overrides the xaml resource for App.Theme.BackgroundBrush
2727
/// </summary>
28-
/// <param name="appThemeRootBackgroundColor"></param>
29-
public void SetRootBackgroundColor(Color appThemeRootBackgroundColor)
28+
/// <param name="appThemeBackgroundColor"></param>
29+
public void SetAppThemeBackgroundColor(Color appThemeBackgroundColor)
3030
{
31-
Application.Current.Resources["RootBackgroundBrush"] = appThemeRootBackgroundColor;
31+
Application.Current.Resources["App.Theme.BackgroundBrush"] = appThemeBackgroundColor;
32+
}
33+
34+
/// <summary>
35+
/// Overrides the xaml resource for App.Theme.AddressBar.BackgroundBrush
36+
/// </summary>
37+
/// <param name="appThemeAddressBarBackgroundColor"></param>
38+
public void SetAppThemeAddressBarBackgroundColor(Color appThemeAddressBarBackgroundColor)
39+
{
40+
Application.Current.Resources["App.Theme.AddressBar.BackgroundBrush"] = appThemeAddressBarBackgroundColor;
41+
42+
// Overrides the selected tab background to match the address bar
43+
Application.Current.Resources["TabViewItemHeaderBackgroundSelected"] = appThemeAddressBarBackgroundColor;
44+
}
45+
46+
/// <summary>
47+
/// Overrides the xaml resource for App.Theme.Sidebar.BackgroundBrush
48+
/// </summary>
49+
/// <param name="appThemeSidebarBackgroundColor"></param>
50+
public void SetAppThemeSidebarBackgroundColor(Color appThemeSidebarBackgroundColor)
51+
{
52+
Application.Current.Resources["App.Theme.Sidebar.BackgroundBrush"] = appThemeSidebarBackgroundColor;
53+
}
54+
55+
/// <summary>
56+
/// Overrides the xaml resource for App.Theme.FileArea.BackgroundBrush
57+
/// </summary>
58+
/// <param name="appThemeFileAreaBackgroundColor"></param>
59+
public void SetAppThemeFileAreaBackgroundColor(Color appThemeFileAreaBackgroundColor)
60+
{
61+
Application.Current.Resources["App.Theme.FileArea.BackgroundBrush"] = appThemeFileAreaBackgroundColor;
62+
}
63+
64+
/// <summary>
65+
/// Overrides the xaml resource for ContentControlThemeFontFamily
66+
/// </summary>
67+
/// <param name="contentControlThemeFontFamily"></param>
68+
public void SetAppThemeFontFamily(string contentControlThemeFontFamily)
69+
{
70+
Application.Current.Resources["ContentControlThemeFontFamily"] = contentControlThemeFontFamily;
3271
}
3372

3473
/// <summary>

src/Files.App/ServicesImplementation/Settings/AppearanceSettingsService.cs

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Files.Backend.Services.Settings;
33
using Files.Shared.EventArguments;
44
using Microsoft.AppCenter.Analytics;
5+
using Microsoft.UI.Xaml.Media;
56
using System;
67

78
namespace Files.App.ServicesImplementation.Settings
@@ -128,12 +129,40 @@ public bool BundlesWidgetExpanded
128129
}
129130

130131
/// <inheritdoc/>
131-
public UInt32 AppThemeRootBackgroundColor
132+
public UInt32 AppThemeBackgroundColor
132133
{
133134
get => Get(uint.MinValue);
134135
set => Set(value);
135136
}
136137

138+
/// <inheritdoc/>
139+
public UInt32 AppThemeAddressBarBackgroundColor
140+
{
141+
get => Get(uint.MinValue);
142+
set => Set(value);
143+
}
144+
145+
/// <inheritdoc/>
146+
public UInt32 AppThemeSidebarBackgroundColor
147+
{
148+
get => Get(uint.MinValue);
149+
set => Set(value);
150+
}
151+
152+
/// <inheritdoc/>
153+
public UInt32 AppThemeFileAreaBackgroundColor
154+
{
155+
get => Get(uint.MinValue);
156+
set => Set(value);
157+
}
158+
159+
/// <inheritdoc/>
160+
public String AppThemeFontFamily
161+
{
162+
get => Get("Segoe UI Variable");
163+
set => Set(value);
164+
}
165+
137166
protected override void RaiseOnSettingChangedEvent(object sender, SettingChangedEventArgs e)
138167
{
139168
switch (e.SettingName)
@@ -150,7 +179,10 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
150179
case nameof(ShowRecentFilesWidget):
151180
case nameof(ShowDrivesWidget):
152181
case nameof(ShowBundlesWidget):
153-
case nameof(AppThemeRootBackgroundColor):
182+
case nameof(AppThemeBackgroundColor):
183+
case nameof(AppThemeAddressBarBackgroundColor):
184+
case nameof(AppThemeSidebarBackgroundColor):
185+
case nameof(AppThemeFileAreaBackgroundColor):
154186
Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
155187
break;
156188
}

src/Files.App/UserControls/AddressToolbar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
x:Name="ToolbarGrid"
4949
HorizontalAlignment="Stretch"
5050
VerticalAlignment="Stretch"
51-
Background="{ThemeResource AddressToolbarBackgroundBrush}"
51+
Background="{ThemeResource App.Theme.AddressBar.BackgroundBrush}"
5252
ColumnSpacing="0">
5353
<Grid Padding="8" ColumnSpacing="4">
5454
<Grid.ColumnDefinitions>

src/Files.App/UserControls/SidebarControl.xaml

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@
143143
Height="60"
144144
HorizontalAlignment="Left"
145145
x:Load="{x:Bind ShowDriveDetails}"
146+
Background="{ThemeResource ProgressRingBackgroundThemeBrush}"
146147
IsIndeterminate="False"
147-
Value="{x:Bind PercentageUsed, Mode=OneWay}"
148-
Background="{ThemeResource ProgressRingBackgroundThemeBrush}">
148+
Value="{x:Bind PercentageUsed, Mode=OneWay}">
149149

150150
<ProgressRing.Template>
151151
<ControlTemplate TargetType="ProgressRing">
@@ -321,12 +321,11 @@
321321
<Setter Property="VerticalContentAlignment" Value="Stretch" />
322322
<Setter Property="OpenPaneLength" Value="{ThemeResource SplitViewOpenPaneThemeLength}" />
323323
<Setter Property="CompactPaneLength" Value="{ThemeResource SplitViewCompactPaneThemeLength}" />
324-
<Setter Property="PaneBackground" Value="{ThemeResource SystemControlPageBackgroundChromeLowBrush}" />
325324
<Setter Property="CornerRadius" Value="{ThemeResource SplitViewPaneRootCornerRadius}" />
326325
<Setter Property="Template">
327326
<Setter.Value>
328327
<ControlTemplate TargetType="SplitView">
329-
<Grid Background="{TemplateBinding Background}" CornerRadius="0">
328+
<Grid>
330329
<Grid.ColumnDefinitions>
331330
<ColumnDefinition x:Name="ColumnDefinition1" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneGridLength, FallbackValue=0}" />
332331
<ColumnDefinition x:Name="ColumnDefinition2" Width="*" />
@@ -337,44 +336,18 @@
337336
<RowDefinition Height="*" />
338337
</Grid.RowDefinitions>
339338

340-
<!-- I exist to make a nice looking background for both the tab strip without interfering with the drag area grid -->
341-
<Border
342-
x:Name="TitlebarBackgroundBorder"
343-
Grid.Column="0"
344-
Grid.ColumnSpan="2"
345-
VerticalAlignment="Stretch"
346-
Background="{ThemeResource TitlebarContentBackgroundBrush}"
347-
CornerRadius="0,0,0,0"
348-
IsHitTestVisible="False" />
349-
350-
<Border
351-
x:Name="ContentBackgroundBorder"
352-
Grid.Row="1"
353-
Grid.ColumnSpan="2"
354-
HorizontalAlignment="Stretch"
355-
VerticalAlignment="Stretch"
356-
Background="{ThemeResource SidebarContentBackgroundBrush}"
357-
IsHitTestVisible="False" />
358-
359-
<!-- Pane Content Area -->
339+
<!-- Sidebar Navigation -->
360340
<Grid
361341
x:Name="PaneRoot"
362342
Grid.Row="0"
363343
Grid.RowSpan="2"
364344
Grid.ColumnSpan="2"
365345
Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
366346
HorizontalAlignment="Left"
367-
Background="{TemplateBinding PaneBackground}"
368-
BorderBrush="{TemplateBinding BorderBrush}"
369-
BorderThickness="{TemplateBinding BorderThickness}"
370-
CornerRadius="{TemplateBinding CornerRadius}"
347+
Background="{ThemeResource App.Theme.Sidebar.BackgroundBrush}"
371348
RightTapped="PaneRoot_RightTapped"
372349
Visibility="Collapsed">
373350

374-
<Grid.BackgroundTransition>
375-
<BrushTransition />
376-
</Grid.BackgroundTransition>
377-
378351
<Grid.Clip>
379352
<RectangleGeometry x:Name="PaneClipRectangle">
380353
<RectangleGeometry.Transform>
@@ -398,7 +371,7 @@
398371
Visibility="Collapsed" />
399372
</Grid>
400373

401-
<!-- This allows the user to resize the pane -->
374+
<!-- This allows the user to resize the Sidebar -->
402375
<Grid
403376
x:Name="ResizeElementBorder"
404377
Grid.Row="0"
@@ -435,10 +408,11 @@
435408
VerticalAlignment="Top"
436409
Canvas.ZIndex="2" />
437410

438-
<!-- Content Area -->
411+
<!-- File Area -->
439412
<Grid
440413
x:Name="ContentRoot"
441414
Grid.Row="2"
415+
Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}"
442416
Grid.ColumnSpan="2">
443417
<Grid.RenderTransform>
444418
<CompositeTransform x:Name="ContentTransform" />
@@ -955,12 +929,8 @@
955929
<VisualState.Setters>
956930
<Setter Target="PaneRoot.(Grid.Row)" Value="1" />
957931
<Setter Target="ResizeElementBorder.(Grid.Row)" Value="1" />
958-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
959-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
960932
<Setter Target="TabContentBorder.(Grid.Column)" Value="0" />
961933
<Setter Target="TabContentBorder.(Grid.ColumnSpan)" Value="2" />
962-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
963-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
964934
</VisualState.Setters>
965935
</VisualState>
966936
<VisualState x:Name="ClosedCompactRight">
@@ -994,12 +964,8 @@
994964
<VisualState.Setters>
995965
<Setter Target="PaneRoot.(Grid.Row)" Value="1" />
996966
<Setter Target="ResizeElementBorder.(Grid.Row)" Value="1" />
997-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
998-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
999967
<Setter Target="TabContentBorder.(Grid.Column)" Value="0" />
1000968
<Setter Target="TabContentBorder.(Grid.ColumnSpan)" Value="2" />
1001-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
1002-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
1003969
</VisualState.Setters>
1004970
</VisualState>
1005971
<VisualState x:Name="OpenOverlayLeft">
@@ -1053,12 +1019,8 @@
10531019

10541020
<Setter Target="PaneRoot.(Grid.Row)" Value="1" />
10551021
<Setter Target="ResizeElementBorder.(Grid.Row)" Value="1" />
1056-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
1057-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
10581022
<Setter Target="TabContentBorder.(Grid.Column)" Value="0" />
10591023
<Setter Target="TabContentBorder.(Grid.ColumnSpan)" Value="2" />
1060-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
1061-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
10621024
</VisualState.Setters>
10631025
</VisualState>
10641026
<VisualState x:Name="OpenInlineRight">
@@ -1093,12 +1055,8 @@
10931055
<VisualState.Setters>
10941056
<Setter Target="PaneRoot.(Grid.Row)" Value="1" />
10951057
<Setter Target="ResizeElementBorder.(Grid.Row)" Value="1" />
1096-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
1097-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
10981058
<Setter Target="TabContentBorder.(Grid.Column)" Value="0" />
10991059
<Setter Target="TabContentBorder.(Grid.ColumnSpan)" Value="2" />
1100-
<Setter Target="TitlebarBackgroundBorder.(Grid.Column)" Value="0" />
1101-
<Setter Target="TitlebarBackgroundBorder.(Grid.ColumnSpan)" Value="2" />
11021060
</VisualState.Setters>
11031061
</VisualState>
11041062
<VisualState x:Name="OpenCompactOverlayLeft">

0 commit comments

Comments
 (0)