Skip to content

Fix keyboard focus not reaching DataGrid column headers #791

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
dipeshmsft merged 2 commits into from
Jul 6, 2026
+27 −2
Merged

Fix keyboard focus not reaching DataGrid column headers #791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082088a
Fix focus on DataGrid column headers (3018981)
wnvko-msft Jun 29, 2026
d8870cc
Inset column header focus visual so it isn't clipped
wnvko-msft Jul 6, 2026
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
29 changes: 27 additions & 2 deletions Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
mc:Ignorable="d">

<Page.Resources>
<Style x:Key="ColumnHeaderFocusVisualStyle">
<Setter Property="Control.Template">
<Setter.Value>
<ControlTemplate>
<Rectangle
Margin="2"
RadiusX="4"
RadiusY="4"
SnapsToDevicePixels="True"
Stroke="{DynamicResource KeyboardFocusBorderColorBrush}"
StrokeThickness="2" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Page.Resources>

<Grid x:Name="ContentPagePane" Height="Auto">

<Grid.RowDefinitions>
Expand All @@ -33,12 +51,19 @@
<controls:ControlExample
Margin="10"
HeaderText="Default DataGrid with ItemsSource."
XamlCode="&lt;DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot; /&gt;">
XamlCode="&lt;DataGrid ItemsSource=&quot;{Binding ViewModel.ProductsCollection, Mode=TwoWay}&quot;&gt;&#10;&#9;&lt;DataGrid.ColumnHeaderStyle&gt;&#10;&#9;&#9;&lt;Style BasedOn=&quot;{StaticResource {x:Type DataGridColumnHeader}}&quot; TargetType=&quot;DataGridColumnHeader&quot;&gt;&#10;&#9;&#9;&#9;&lt;Setter Property=&quot;Focusable&quot; Value=&quot;True&quot; /&gt;&#10;&#9;&#9;&#9;&lt;Setter Property=&quot;FocusVisualStyle&quot; Value=&quot;{StaticResource ColumnHeaderFocusVisualStyle}&quot; /&gt;&#10;&#9;&#9;&lt;/Style&gt;&#10;&#9;&lt;/DataGrid.ColumnHeaderStyle&gt;&#10;&lt;/DataGrid&gt;">
<DataGrid
x:Name="SampleDataGrid"
Height="400"
AutomationProperties.Name="Sample Data Grid"
ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}" />
ItemsSource="{Binding ViewModel.ProductsCollection, Mode=TwoWay}">
<DataGrid.ColumnHeaderStyle>
<Style BasedOn="{StaticResource {x:Type DataGridColumnHeader}}" TargetType="DataGridColumnHeader">
<Setter Property="Focusable" Value="True" />
<Setter Property="FocusVisualStyle" Value="{StaticResource ColumnHeaderFocusVisualStyle}" />
</Style>
</DataGrid.ColumnHeaderStyle>
</DataGrid>
</controls:ControlExample>

</StackPanel>
Expand Down
Loading