Merge pull request #225 from unoplatform/mergify/bp/unorel/winui/7.1.…

…200/pr-224 fix(DataGrid): not displaying cells from last columns when resized from scrolled state (backport #224)
unoplatform · Nov 18, 2024 · c51a04f · c51a04f
2 parents 7b3d97d + c90b056
commit c51a04f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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

diff --git a/nuget.config b/nuget.config
@@ -4,7 +4,6 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="AzureLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" protocolVersion="3" />
-    <add key="MUX-Shared" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Shared/nuget/v3/index.json" />
     <add key="unoplatformdev" value="https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/unoplatformdev/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>