From 082088a146ac4434634309e82aad7c202f5ce2ca Mon Sep 17 00:00:00 2001
From: "Milko Venkov (INFRAGISTICS INC)" <b-mvenkov@microsoft.com>
Date: Mon, 29 Jun 2026 12:32:12 +0300
Subject: [PATCH 1/2] Fix focus on DataGrid column headers (3018981)

---
 .../WPFGallery/Views/Collections/DataGridPage.xaml     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml b/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml
index 36b915f00..ee43a553c 100644
--- a/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml	
@@ -33,12 +33,18 @@
                 <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;&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" />
+                            </Style>
+                        </DataGrid.ColumnHeaderStyle>
+                    </DataGrid>
                 </controls:ControlExample>
 
             </StackPanel>

From d8870ccfc20814fd47538dbd15c7590f4b529915 Mon Sep 17 00:00:00 2001
From: "Milko Venkov (INFRAGISTICS INC)" <b-mvenkov@microsoft.com>
Date: Mon, 6 Jul 2026 16:07:09 +0300
Subject: [PATCH 2/2] Inset column header focus visual so it isn't clipped

---
 .../Views/Collections/DataGridPage.xaml       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml b/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml
index ee43a553c..884391052 100644
--- a/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml	
+++ b/Sample Applications/WPFGallery/Views/Collections/DataGridPage.xaml	
@@ -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>
@@ -33,7 +51,7 @@
                 <controls:ControlExample
                     Margin="10"
                     HeaderText="Default DataGrid with ItemsSource."
-                    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;&lt;/Style&gt;&#10;&#9;&lt;/DataGrid.ColumnHeaderStyle&gt;&#10;&lt;/DataGrid&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"
@@ -42,6 +60,7 @@
                         <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>