Removes hard-coded Grid.RowSpan and Grid.ColumnSpan from FluentTheme in Data grid - based on #12301 (#14460)

2 years ago · 3433a6aa6d
1 changed files with 4 additions and 2 deletions
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@ -535,8 +535,6 @@

              <DataGridRowsPresenter Name="PART_RowsPresenter"
                                     Grid.Row="1"
-                                     Grid.RowSpan="2"
-                                     Grid.ColumnSpan="3"
                                     Grid.Column="0"
                                     ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}">
                <DataGridRowsPresenter.GestureRecognizers>
@ -589,6 +587,10 @@
          <Setter Property="IsVisible" Value="False" />
        </Style>
      </Style>
+      <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
+        <Setter Property="Grid.RowSpan" Value="2" />
+        <Setter Property="Grid.ColumnSpan" Value="3" />
+      </Style>
    </ControlTheme>
   </ResourceDictionary>
  </Styles.Resources>