Skip to content

Fixed DataGrid Column Header issues #10912

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

Merged
merged 1 commit into from
Jun 5, 2025
Merged

Fixed DataGrid Column Header issues #10912

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
19 changes: 19 additions & 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 @@ -526,6 +526,25 @@
<SolidColorBrush x:Key="ContextMenuForeground" Color="{StaticResource TextFillColorPrimary}" />

<!-- DataGrid -->
<SolidColorBrush x:Key="DataGridColumnFloatingHeaderBorderBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
<SolidColorBrush x:Key="DataGridHeaderDropSeparatorBackground" Color="{StaticResource ControlStrongStrokeColorDefault}" />
<SolidColorBrush x:Key="DataGridHeaderSeparatorBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
<!-- 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="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundDisabled" Color="{StaticResource SubtleFillColorDisabled}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundSelected" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPointerOver" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPressed" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushDisabled" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushSelected" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />

<SolidColorBrush x:Key="DataGridRowSelectedBackgroundThemeBrush" Color="{StaticResource SystemAccentColorLight3}" />
<SolidColorBrush x:Key="DataGridRowSelectedForegroundThemeBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />

Expand Down
16 changes: 16 additions & 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 @@ -348,6 +348,22 @@
<SolidColorBrush x:Key="ContextMenuForeground" Color="{StaticResource SystemColorWindowTextColor}" />

<!-- DataGrid -->
<SolidColorBrush x:Key="DataGridColumnFloatingHeaderBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderDropSeparatorBackground" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderSeparatorBrush" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundDisabled" Color="{StaticResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundSelected" Color="{StaticResource SystemColorHighlightTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrush" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushSelected" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridHeaderForegroundDisabled" Color="{StaticResource SystemColorGrayTextColor}" />

<SolidColorBrush x:Key="DataGridRowSelectedBackgroundThemeBrush" Color="{StaticResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="DataGridRowSelectedForegroundThemeBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

Expand Down
19 changes: 19 additions & 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 @@ -542,6 +542,25 @@
<SolidColorBrush x:Key="ContextMenuForeground" Color="{StaticResource TextFillColorPrimary}" />

<!-- DataGrid -->
<SolidColorBrush x:Key="DataGridColumnFloatingHeaderBorderBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
<SolidColorBrush x:Key="DataGridHeaderDropSeparatorBackground" Color="{StaticResource ControlStrongStrokeColorDefault}" />
<SolidColorBrush x:Key="DataGridHeaderSeparatorBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
<!-- 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="DataGridColumnHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="DataGridHeaderBackground" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundDisabled" Color="{StaticResource SubtleFillColorDisabled}" />
<SolidColorBrush x:Key="DataGridHeaderBackgroundSelected" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPointerOver" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushPressed" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushDisabled" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderBorderBrushSelected" Color="{StaticResource ControlStrokeColorSecondary}" />
<SolidColorBrush x:Key="DataGridHeaderForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />

<SolidColorBrush x:Key="DataGridRowSelectedBackgroundThemeBrush" Color="{StaticResource SystemAccentColorDark1}" />
<SolidColorBrush x:Key="DataGridRowSelectedForegroundThemeBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />

Expand Down
Loading