Merge pull request #479 from enisn/2.6-datagrid-separator-fix

Fix DataGrid separator ColumnSpan
enisn · Nov 6, 2023 · b159161 · b159161
2 parents 55029ce + 9dba6af
commit b159161
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/UraniumUI.Material/Controls/DataGrid.cs b/src/UraniumUI.Material/Controls/DataGrid.cs
@@ -78,7 +78,7 @@ private void ItemsSource_CollectionChanged(object sender, NotifyCollectionChange
         {
             case NotifyCollectionChangedAction.Add:
                 {
-                    SlideRow(e.NewStartingIndex+1, 2 * e.NewItems.Count);
+                    SlideRow(e.NewStartingIndex + 1, 2 * e.NewItems.Count);
 
                     for (int i = 0; i < e.NewItems.Count; i++)
                     {
@@ -261,11 +261,7 @@ protected virtual void RemoveRow(int row)
     protected virtual void AddSeparator(int row)
     {
         var line = HorizontalLineFactory() ?? CreateHorizontalLine();
-
-        Grid.SetColumnSpan(line, Columns.Count);
-
-        _rootGrid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
-        _rootGrid.Add(line, 0, row);
+        _rootGrid.AddWithSpan(line, row, 0, columnSpan: Columns.Count);
     }
 
     private void ConfigureGridColumnDefinitions(int columns)