Skip to content

Fixed DataGrid column header text color in HC mode #10956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed DataGrid column header text color in HC mode #10956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@
<!-- DataGridHeaderBackground is used for PART_FillerColumnHeader and Row Headers
whereas DataGridColumnHeaderBackground is used for Column Headers. This is a bit confusing
but due to transparency in colors had to follow this. -->
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@
<SolidColorBrush x:Key="DataGridColumnFloatingHeaderBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderDropSeparatorBackground" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderSeparatorBrush" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightTextColor}" />
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@
<!-- DataGridHeaderBackground is used for PART_FillerColumnHeader and Row Headers
whereas DataGridColumnHeaderBackground is used for Column Headers. This is a bit confusing
but due to transparency in colors had to follow this. -->
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@

<!-- Style and template for the DataGridColumnHeader. -->
<Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForeground}" />
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DataGridHeaderBorderBrush}" />
<Setter Property="MinHeight" Value="{StaticResource DataGridColumnHeaderMinHeight}" />
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@
<!-- DataGridHeaderBackground is used for PART_FillerColumnHeader and Row Headers
whereas DataGridColumnHeaderBackground is used for Column Headers. This is a bit confusing
but due to transparency in colors had to follow this. -->
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
Expand Down Expand Up @@ -2161,6 +2162,7 @@
</Style>
<!-- Style and template for the DataGridColumnHeader. -->
<Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForeground}" />
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DataGridHeaderBorderBrush}" />
<Setter Property="MinHeight" Value="{StaticResource DataGridColumnHeaderMinHeight}" />
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@
<SolidColorBrush x:Key="DataGridColumnFloatingHeaderBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderDropSeparatorBackground" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderSeparatorBrush" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightTextColor}" />
Expand Down Expand Up @@ -2061,6 +2062,7 @@
</Style>
<!-- Style and template for the DataGridColumnHeader. -->
<Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForeground}" />
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DataGridHeaderBorderBrush}" />
<Setter Property="MinHeight" Value="{StaticResource DataGridColumnHeaderMinHeight}" />
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@
<!-- DataGridHeaderBackground is used for PART_FillerColumnHeader and Row Headers
whereas DataGridColumnHeaderBackground is used for Column Headers. This is a bit confusing
but due to transparency in colors had to follow this. -->
<SolidColorBrush x:Key="DataGridColumnHeaderForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
Expand Down Expand Up @@ -2176,6 +2177,7 @@
</Style>
<!-- Style and template for the DataGridColumnHeader. -->
<Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForeground}" />
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DataGridHeaderBorderBrush}" />
<Setter Property="MinHeight" Value="{StaticResource DataGridColumnHeaderMinHeight}" />
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,7 @@
</Style>
<!-- Style and template for the DataGridColumnHeader. -->
<Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForeground}" />
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource DataGridHeaderBorderBrush}" />
<Setter Property="MinHeight" Value="{StaticResource DataGridColumnHeaderMinHeight}" />
Expand Down