diff --git a/CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs b/CommunityToolkit.WinUI.UI.Controls.DataGrid/DataGrid/DataGridColumns.cs index 1e78101961..e15af03234 100644 --- 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 diff --git a/nuget.config b/nuget.config index f18ab1c257..37606be13e 100644 --- a/nuget.config +++ b/nuget.config @@ -4,7 +4,6 @@ -