From ea946b2b7ceb67737fa432d39b5e9af33329a01b Mon Sep 17 00:00:00 2001
From: Flithor <23412916+Flithor@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:22:48 +0800
Subject: [PATCH 1/2] Update Fluent.xaml

---
 .../Themes/Fluent.xaml                        | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 0cc620dae9..e6831faf87 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -170,26 +170,28 @@
                   CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
 
-              <Grid Margin="{TemplateBinding Padding}"
+              <StackPanel Margin="{TemplateBinding Padding}"
                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" MinWidth="{DynamicResource DataGridSortIconMinWidth}" />
-                </Grid.ColumnDefinitions>
-
-                <ContentPresenter Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-                <Path Name="SortIcon"
-                      IsVisible="False"
-                      Grid.Column="1"
-                      Height="12"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Fill="{TemplateBinding Foreground}"
-                      Stretch="Uniform" />
-              </Grid>
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" MinWidth="{DynamicResource DataGridSortIconMinWidth}" />
+                  </Grid.ColumnDefinitions>
+                
+                  <ContentPresenter Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                
+                  <Path Name="SortIcon"
+                        IsVisible="False"
+                        Grid.Column="1"
+                        Height="12"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Fill="{TemplateBinding Foreground}"
+                        Stretch="Uniform" />
+                </Grid>
+              </StackPanel>
 
               <Rectangle Name="VerticalSeparator"
                          Grid.Column="1"

From 2dbe0d717e259934e719e8764219e4f3e706545b Mon Sep 17 00:00:00 2001
From: Flithor <23412916+Flithor@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:27:28 +0800
Subject: [PATCH 2/2] Update Fluent.xaml

---
 src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index e6831faf87..2d40721bbf 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -170,7 +170,7 @@
                   CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
 
-              <StackPanel Margin="{TemplateBinding Padding}"
+              <Panel Margin="{TemplateBinding Padding}"
                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <Grid>
@@ -191,7 +191,7 @@
                         Fill="{TemplateBinding Foreground}"
                         Stretch="Uniform" />
                 </Grid>
-              </StackPanel>
+              </Panel>
 
               <Rectangle Name="VerticalSeparator"
                          Grid.Column="1"