Merge pull request #224 from unoplatform/dev/xygu/20241114/datagrid-cell-mia-on-resize

jeromelaban · web-flow · commit 0216730a3119 · 2024-11-18T08:49:05.000-05:00
fix(DataGrid): not displaying cells from last columns when resized from scrolled state
diff --git a/CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs b/CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs
@@ -1245,6 +1245,14 @@ private bool ComputeDisplayedColumns()
                             _horizontalOffset -= GetEdgedColumnWidth(dataGridColumn);
                             dataGridColumn = this.ColumnsInternal.GetPreviousVisibleScrollingColumn(dataGridColumn);
                         }
+
+                        if (_horizontalOffset == 0 && cx < displayWidth)
+                        {
+                            // if the columns have been scrolled, and all visible columns are fully rendered in the available space,
+                            // then HorizontalAdjustment needs to be updated so that DataGridCellsPresenter.ShouldDisplayCell
+                            // don't hide columns based on the old value.
+                            HorizontalAdjustment = displayWidth - cx;
+                        }
                     }
 
                     // third try to partially scroll in first scrolled off column

Original file line number	Diff line number	Diff line change
`@@ -1245,6 +1245,14 @@ private bool ComputeDisplayedColumns()`
`1245`	`1245`	`_horizontalOffset -= GetEdgedColumnWidth(dataGridColumn);`
`1246`	`1246`	`dataGridColumn = this.ColumnsInternal.GetPreviousVisibleScrollingColumn(dataGridColumn);`
`1247`	`1247`	`}`
	`1248`	`+`
	`1249`	`+ if (_horizontalOffset == 0 && cx < displayWidth)`
	`1250`	`+ {`
	`1251`	`+ // if the columns have been scrolled, and all visible columns are fully rendered in the available space,`
	`1252`	`+ // then HorizontalAdjustment needs to be updated so that DataGridCellsPresenter.ShouldDisplayCell`
	`1253`	`+ // don't hide columns based on the old value.`
	`1254`	`+ HorizontalAdjustment = displayWidth - cx;`
	`1255`	`+ }`
`1248`	`1256`	`}`
`1249`	`1257`
`1250`	`1258`	`// third try to partially scroll in first scrolled off column`