Skip to content

Commit b51b635

Browse files
authored
Improve theming of DataGrid column header separator line (#2414)
1 parent 8468f29 commit b51b635

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

Files/Views/LayoutModes/GenericFileBrowser.xaml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@
643643
CellEditEnded="AllView_CellEditEnded"
644644
CellEditEnding="AllView_CellEditEnding"
645645
ClipboardCopyMode="None"
646+
ColumnHeaderHeight="38"
646647
DoubleTapped="{x:Bind ParentShellPageInstance.InteractionOperations.List_ItemDoubleClick}"
647648
DragOver="List_DragOver"
648649
Drop="List_Drop"
@@ -662,9 +663,28 @@
662663
SelectionMode="Extended"
663664
Sorting="AllView_Sorting">
664665
<controls:DataGrid.Resources>
665-
<SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent" />
666-
<SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent" />
667-
<StaticResource x:Key="DataGridColumnHeaderBackgroundColor" ResourceKey="SystemControlTransparentBrush" />
666+
<ResourceDictionary>
667+
<ResourceDictionary.ThemeDictionaries>
668+
<ResourceDictionary x:Key="Light">
669+
<SolidColorBrush x:Key="GridLinesBrush" Color="#edebe9" />
670+
<Color x:Key="DataGridColumnHeaderBackgroundColor">White</Color>
671+
</ResourceDictionary>
672+
<ResourceDictionary x:Key="Dark">
673+
<SolidColorBrush x:Key="GridLinesBrush" Color="#3b3a39" />
674+
<Color x:Key="DataGridColumnHeaderBackgroundColor">#201F1E</Color>
675+
</ResourceDictionary>
676+
<ResourceDictionary x:Key="HighContrast">
677+
<SolidColorBrush x:Key="GridLinesBrush" Color="{StaticResource SystemColorWindowTextColor}" />
678+
<StaticResource x:Key="DataGridColumnHeaderBackgroundColor" ResourceKey="SystemColorWindowColor" />
679+
</ResourceDictionary>
680+
</ResourceDictionary.ThemeDictionaries>
681+
<ResourceDictionary.MergedDictionaries>
682+
<ResourceDictionary>
683+
<SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent" />
684+
<SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent" />
685+
</ResourceDictionary>
686+
</ResourceDictionary.MergedDictionaries>
687+
</ResourceDictionary>
668688
</controls:DataGrid.Resources>
669689
<controls:DataGrid.ColumnHeaderStyle>
670690
<Style TargetType="controlsprimitives:DataGridColumnHeader">
@@ -691,11 +711,10 @@
691711
</Setter.Value>
692712
</Setter>
693713
<Setter Property="SeparatorBrush" Value="Transparent" />
694-
<Setter Property="Height" Value="38" />
695714
<Setter Property="FontSize" Value="14" />
696715
<Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
697716
<Setter Property="FontWeight" Value="SemiBold" />
698-
<Setter Property="Background" Value="Transparent" />
717+
<Setter Property="Background" Value="{ThemeResource DataGridColumnHeaderBackgroundColor}" />
699718
</Style>
700719
</controls:DataGrid.ColumnHeaderStyle>
701720
<Interactivity:Interaction.Behaviors>

0 commit comments

Comments
 (0)