From 8bebf7153e37e23b6788e3a3b6fa953ab69d13d4 Mon Sep 17 00:00:00 2001
From: Tim <47110241+timunie@users.noreply.github.com>
Date: Wed, 22 Nov 2023 00:39:52 +0100
Subject: [PATCH] Do not hardcode Grid.*Span-Properties for ScrollViewer
 (#12301)

looks like this is only valid for FluentTheme.

Co-authored-by: Jumar Macato <16554748+jmacato@users.noreply.github.com>
---
 src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index a552f80781..611c7dc49b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -27,8 +27,6 @@
           <ScrollContentPresenter Name="PART_ContentPresenter"
                                   Grid.Row="0"
                                   Grid.Column="0"
-                                  Grid.RowSpan="2"
-                                  Grid.ColumnSpan="2"
                                   Background="{TemplateBinding Background}"
                                   HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
                                   VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}"
@@ -65,5 +63,9 @@
     <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
       <Setter Property="Opacity" Value="1" />
     </Style>
+    <Style Selector="^[AllowAutoHide=True] /template/ ScrollContentPresenter#PART_ContentPresenter">
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+      <Setter Property="Grid.RowSpan" Value="2" />
+    </Style>
   </ControlTheme>
 </ResourceDictionary>