From a3ed11fa10ce10f6b8a4e8a18c1e328e5e378f91 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Thu, 15 Aug 2024 17:41:31 +0800
Subject: [PATCH 1/2] feat: respect AllowAutoHide in DataGrid.

---
 src/Semi.Avalonia.DataGrid/DataGrid.axaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
index e9a5a88..f842ab3 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -471,6 +471,7 @@
         <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="SelectionMode" Value="Extended" />
         <Setter Property="GridLinesVisibility" Value="None" />
+        <Setter Property="ScrollViewer.AllowAutoHide" Value="True"></Setter>
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="DropLocationIndicatorTemplate">
@@ -570,5 +571,15 @@
                 <Setter Property="IsVisible" Value="False" />
             </Style>
         </Style>
+        
+        <Style Selector="^[(ScrollViewer.AllowAutoHide)=False]">
+            <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
+                <Setter Property="Grid.RowSpan" Value="1"></Setter>
+                <Setter Property="Grid.ColumnSpan" Value="2"></Setter>
+            </Style>
+            <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+                <Setter Property="Grid.ColumnSpan" Value="1"></Setter>
+            </Style>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>

From b80deac6923cef4de96005a3ca1e372370ee7016 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:53:06 +0800
Subject: [PATCH 2/2] feat:add AutoHide ToggleSwitch to DataGrid demo.

---
 demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml |  6 +++++-
 src/Semi.Avalonia.DataGrid/DataGrid.axaml        | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
index ba7f847..d2c8add 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -14,7 +14,10 @@
     <TabControl>
         <TabItem Header="DataGrid">
            <Grid RowDefinitions="Auto, *">
-               <ToggleSwitch Grid.Row="0" Content="Disable" Name="DisableToggle"></ToggleSwitch>
+               <StackPanel Grid.Row="0" Orientation="Horizontal">
+                   <ToggleSwitch Content="Disable" Name="DisableToggle" />
+                   <ToggleSwitch Content="ScrollViewerHide" Name="ScrollViewerHide" />
+               </StackPanel>
                <DataGrid Grid.Row="1"
                          Margin="8"
                          CanUserReorderColumns="True"
@@ -22,6 +25,7 @@
                          CanUserSortColumns="True"
                          HeadersVisibility="All"
                          IsReadOnly="True"
+                         ScrollViewer.AllowAutoHide="{Binding #ScrollViewerHide.IsChecked}"
                          IsEnabled="{Binding #DisableToggle.IsChecked}"
                          ItemsSource="{Binding GridData1}">
                    <DataGrid.Columns>
diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
index f842ab3..7793490 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -471,7 +471,7 @@
         <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="SelectionMode" Value="Extended" />
         <Setter Property="GridLinesVisibility" Value="None" />
-        <Setter Property="ScrollViewer.AllowAutoHide" Value="True"></Setter>
+        <Setter Property="ScrollViewer.AllowAutoHide" Value="True" />
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="DropLocationIndicatorTemplate">
@@ -571,14 +571,14 @@
                 <Setter Property="IsVisible" Value="False" />
             </Style>
         </Style>
-        
+
         <Style Selector="^[(ScrollViewer.AllowAutoHide)=False]">
             <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
-                <Setter Property="Grid.RowSpan" Value="1"></Setter>
-                <Setter Property="Grid.ColumnSpan" Value="2"></Setter>
+                <Setter Property="Grid.RowSpan" Value="1" />
+                <Setter Property="Grid.ColumnSpan" Value="2" />
             </Style>
             <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-                <Setter Property="Grid.ColumnSpan" Value="1"></Setter>
+                <Setter Property="Grid.ColumnSpan" Value="1" />
             </Style>
         </Style>
     </ControlTheme>