Skip to content

Commit 278513f

Browse files
gave92gave92
authored
Remove duplicate definitions of GridSplitter style (#5963)
1 parent 4be1ee2 commit 278513f

File tree

6 files changed

+28
-230
lines changed

6 files changed

+28
-230
lines changed

‎Files/ResourceDictionaries/DefaultGridSplitterStyle.xaml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Setter Property="IsFocusEngagementEnabled" Value="True" />
1212
<Setter Property="MinWidth" Value="2" />
1313
<Setter Property="MinHeight" Value="2" />
14+
<Setter Property="BorderBrush" Value="{ThemeResource SplitterBorderBrush}" />
1415
<Setter Property="Background" Value="Transparent" />
1516
<Setter Property="GripperForeground" Value="Transparent" />
1617
<Setter Property="Template">
@@ -19,7 +20,7 @@
1920
<Grid
2021
x:Name="RootGrid"
2122
Background="Transparent"
22-
BorderBrush="{ThemeResource SystemBaseLowColor}"
23+
BorderBrush="{TemplateBinding BorderBrush}"
2324
BorderThickness="1,0,0,0">
2425
<ContentPresenter
2526
HorizontalContentAlignment="Stretch"
@@ -28,7 +29,11 @@
2829
<VisualStateManager.VisualStateGroups>
2930
<VisualStateGroup x:Name="GridSplitterStates">
3031
<VisualState x:Name="Normal" />
31-
32+
<VisualState x:Name="PointerOver">
33+
<VisualState.Setters>
34+
<Setter Target="RootGrid.Background" Value="Transparent" />
35+
</VisualState.Setters>
36+
</VisualState>
3237
<VisualState x:Name="Pressed">
3338
<VisualState.Setters>
3439
<Setter Target="RootGrid.Background" Value="Transparent" />
@@ -42,26 +47,25 @@
4247
</Setter>
4348
</Style>
4449

45-
<Style x:Key="PaneGridSplitter" TargetType="controls:GridSplitter">
46-
<Setter Property="IsTabStop" Value="True" />
47-
<Setter Property="UseSystemFocusVisuals" Value="True" />
48-
<Setter Property="HorizontalAlignment" Value="Stretch" />
49-
<Setter Property="VerticalAlignment" Value="Stretch" />
50-
<Setter Property="IsFocusEngagementEnabled" Value="True" />
51-
<Setter Property="MinWidth" Value="2" />
52-
<Setter Property="MinHeight" Value="2" />
53-
<Setter Property="Background" Value="{ThemeResource SystemBaseLowColor}" />
54-
<Setter Property="GripperForeground" Value="{ThemeResource SystemBaseLowColor}" />
50+
<Style
51+
x:Key="InvisibleGridSplitterStyle"
52+
BasedOn="{StaticResource DefaultGridSplitterStyle}"
53+
TargetType="controls:GridSplitter">
54+
<Setter Property="BorderBrush" Value="{ThemeResource TransparentSplitterBorderBrush}" />
5555
</Style>
56+
5657
<ResourceDictionary.ThemeDictionaries>
5758
<ResourceDictionary x:Key="Light">
58-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
59+
<SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="Transparent" />
60+
<SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
5961
</ResourceDictionary>
6062
<ResourceDictionary x:Key="Dark">
61-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
63+
<SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="Transparent" />
64+
<SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
6265
</ResourceDictionary>
6366
<ResourceDictionary x:Key="HighContrast">
64-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
67+
<SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
68+
<SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
6569
</ResourceDictionary>
6670
</ResourceDictionary.ThemeDictionaries>
6771
</ResourceDictionary>

‎Files/UserControls/PreviewPane.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<UserControl.Resources>
2121
<ResourceDictionary>
2222
<ResourceDictionary.MergedDictionaries>
23-
<ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
2423
<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
2524
</ResourceDictionary.MergedDictionaries>
2625
</ResourceDictionary>

‎Files/Views/ColumnShellPage.xaml

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,6 @@
1313
mc:Ignorable="d">
1414
<Page.Resources>
1515
<ResourceDictionary>
16-
<ResourceDictionary.MergedDictionaries>
17-
<ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
18-
</ResourceDictionary.MergedDictionaries>
19-
20-
<ResourceDictionary.ThemeDictionaries>
21-
<ResourceDictionary x:Key="Light">
22-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
23-
</ResourceDictionary>
24-
<ResourceDictionary x:Key="Dark">
25-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
26-
</ResourceDictionary>
27-
<ResourceDictionary x:Key="HighContrast">
28-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
29-
</ResourceDictionary>
30-
</ResourceDictionary.ThemeDictionaries>
31-
32-
<Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
33-
<Setter Property="IsTabStop" Value="True" />
34-
<Setter Property="UseSystemFocusVisuals" Value="True" />
35-
<Setter Property="HorizontalAlignment" Value="Stretch" />
36-
<Setter Property="VerticalAlignment" Value="Stretch" />
37-
<Setter Property="IsFocusEngagementEnabled" Value="True" />
38-
<Setter Property="MinWidth" Value="2" />
39-
<Setter Property="MinHeight" Value="2" />
40-
<Setter Property="Background" Value="Transparent" />
41-
<Setter Property="GripperForeground" Value="Transparent" />
42-
<Setter Property="Template">
43-
<Setter.Value>
44-
<ControlTemplate TargetType="Custom:GridSplitter">
45-
<Grid
46-
x:Name="RootGrid"
47-
Background="Transparent"
48-
BorderBrush="{ThemeResource SidebarBorderBrush}"
49-
BorderThickness="1,0,0,0">
50-
<ContentPresenter
51-
HorizontalContentAlignment="Stretch"
52-
VerticalContentAlignment="Stretch"
53-
Content="{TemplateBinding Element}" />
54-
<VisualStateManager.VisualStateGroups>
55-
<VisualStateGroup x:Name="GridSplitterStates">
56-
<VisualState x:Name="Normal" />
57-
<VisualState x:Name="PointerOver">
58-
<VisualState.Setters>
59-
<Setter Target="RootGrid.Background" Value="Transparent" />
60-
</VisualState.Setters>
61-
</VisualState>
62-
<VisualState x:Name="Pressed">
63-
<VisualState.Setters>
64-
<Setter Target="RootGrid.Background" Value="Transparent" />
65-
</VisualState.Setters>
66-
</VisualState>
67-
</VisualStateGroup>
68-
</VisualStateManager.VisualStateGroups>
69-
</Grid>
70-
</ControlTemplate>
71-
</Setter.Value>
72-
</Setter>
73-
</Style>
74-
7516
<converters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
7617

7718
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />

‎Files/Views/MainPage.xaml

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,20 @@
2525
</Page.DataContext>
2626
<Page.Resources>
2727
<ResourceDictionary>
28+
<ResourceDictionary.MergedDictionaries>
29+
<ResourceDictionary Source="ms-appx:///ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
30+
</ResourceDictionary.MergedDictionaries>
31+
2832
<ResourceDictionary.ThemeDictionaries>
2933
<ResourceDictionary x:Key="Light">
30-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
3134
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
3235
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
3336
</ResourceDictionary>
3437
<ResourceDictionary x:Key="Dark">
35-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
3638
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
3739
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
3840
</ResourceDictionary>
3941
<ResourceDictionary x:Key="HighContrast">
40-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
4142
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
4243
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
4344
</ResourceDictionary>
@@ -46,48 +47,6 @@
4647
<x:Boolean x:Key="True">True</x:Boolean>
4748
<x:Boolean x:Key="False">False</x:Boolean>
4849

49-
<Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
50-
<Setter Property="IsTabStop" Value="True" />
51-
<Setter Property="UseSystemFocusVisuals" Value="True" />
52-
<Setter Property="HorizontalAlignment" Value="Stretch" />
53-
<Setter Property="VerticalAlignment" Value="Stretch" />
54-
<Setter Property="IsFocusEngagementEnabled" Value="True" />
55-
<Setter Property="MinWidth" Value="2" />
56-
<Setter Property="MinHeight" Value="2" />
57-
<Setter Property="Background" Value="Transparent" />
58-
<Setter Property="GripperForeground" Value="Transparent" />
59-
<Setter Property="Template">
60-
<Setter.Value>
61-
<ControlTemplate TargetType="Custom:GridSplitter">
62-
<Grid
63-
x:Name="RootGrid"
64-
Background="Transparent"
65-
BorderBrush="Transparent"
66-
BorderThickness="1,0,0,0">
67-
<ContentPresenter
68-
HorizontalContentAlignment="Stretch"
69-
VerticalContentAlignment="Stretch"
70-
Content="{TemplateBinding Element}" />
71-
<VisualStateManager.VisualStateGroups>
72-
<VisualStateGroup x:Name="GridSplitterStates">
73-
<VisualState x:Name="Normal" />
74-
<VisualState x:Name="PointerOver">
75-
<VisualState.Setters>
76-
<Setter Target="RootGrid.Background" Value="Transparent" />
77-
</VisualState.Setters>
78-
</VisualState>
79-
<VisualState x:Name="Pressed">
80-
<VisualState.Setters>
81-
<Setter Target="RootGrid.Background" Value="Transparent" />
82-
</VisualState.Setters>
83-
</VisualState>
84-
</VisualStateGroup>
85-
</VisualStateManager.VisualStateGroups>
86-
</Grid>
87-
</ControlTemplate>
88-
</Setter.Value>
89-
</Setter>
90-
</Style>
9150
<converters:WidthToRightMargin x:Key="WidthToRightMarginConverter" />
9251
<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
9352
</ResourceDictionary>
@@ -446,7 +405,7 @@
446405
x:Load="{x:Bind LoadPreviewPane, Mode=OneWay}"
447406
ManipulationCompleted="PreviewPaneGridSplitter_ManipulationCompleted"
448407
ResizeBehavior="BasedOnAlignment"
449-
Style="{StaticResource DefaultGridSplitterStyle}" />
408+
Style="{StaticResource InvisibleGridSplitterStyle}" />
450409

451410
<controls:StatusBarControl
452411
x:Name="StatusBarControl"

‎Files/Views/ModernShellPage.xaml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
x:Class="Files.Views.ModernShellPage"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:Custom="using:Microsoft.Toolkit.Uwp.UI.Controls"
65
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
76
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,65 +12,6 @@
1312
mc:Ignorable="d">
1413
<Page.Resources>
1514
<ResourceDictionary>
16-
<ResourceDictionary.MergedDictionaries>
17-
<ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
18-
</ResourceDictionary.MergedDictionaries>
19-
20-
<ResourceDictionary.ThemeDictionaries>
21-
<ResourceDictionary x:Key="Light">
22-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
23-
</ResourceDictionary>
24-
<ResourceDictionary x:Key="Dark">
25-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
26-
</ResourceDictionary>
27-
<ResourceDictionary x:Key="HighContrast">
28-
<SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
29-
</ResourceDictionary>
30-
</ResourceDictionary.ThemeDictionaries>
31-
32-
<Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
33-
<Setter Property="IsTabStop" Value="True" />
34-
<Setter Property="UseSystemFocusVisuals" Value="True" />
35-
<Setter Property="HorizontalAlignment" Value="Stretch" />
36-
<Setter Property="VerticalAlignment" Value="Stretch" />
37-
<Setter Property="IsFocusEngagementEnabled" Value="True" />
38-
<Setter Property="MinWidth" Value="2" />
39-
<Setter Property="MinHeight" Value="2" />
40-
<Setter Property="Background" Value="Transparent" />
41-
<Setter Property="GripperForeground" Value="Transparent" />
42-
<Setter Property="Template">
43-
<Setter.Value>
44-
<ControlTemplate TargetType="Custom:GridSplitter">
45-
<Grid
46-
x:Name="RootGrid"
47-
Background="Transparent"
48-
BorderBrush="{ThemeResource SidebarBorderBrush}"
49-
BorderThickness="1,0,0,0">
50-
<ContentPresenter
51-
HorizontalContentAlignment="Stretch"
52-
VerticalContentAlignment="Stretch"
53-
Content="{TemplateBinding Element}" />
54-
<VisualStateManager.VisualStateGroups>
55-
<VisualStateGroup x:Name="GridSplitterStates">
56-
<VisualState x:Name="Normal" />
57-
<VisualState x:Name="PointerOver">
58-
<VisualState.Setters>
59-
<Setter Target="RootGrid.Background" Value="Transparent" />
60-
</VisualState.Setters>
61-
</VisualState>
62-
<VisualState x:Name="Pressed">
63-
<VisualState.Setters>
64-
<Setter Target="RootGrid.Background" Value="Transparent" />
65-
</VisualState.Setters>
66-
</VisualState>
67-
</VisualStateGroup>
68-
</VisualStateManager.VisualStateGroups>
69-
</Grid>
70-
</ControlTemplate>
71-
</Setter.Value>
72-
</Setter>
73-
</Style>
74-
7515
<converters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
7616

7717
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />

0 commit comments

Comments
 (0)