From d2f8fe6c735681fe33ea1f1b90725ffaa3f98e75 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Fri, 15 Jul 2022 21:04:07 +0800
Subject: [PATCH] Merge pull request #8520 from
 timunie/fix/DataGrid_LastColumnIsClipped

fix: RowDesiredWidth was missing the RowHeaderWidth
---
 .../Primitives/DataGridRowsPresenter.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
index 308ebc69d4..fc1ae83404 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Controls.Primitives
 
             OwningGrid.OnFillerColumnWidthNeeded(finalSize.Width);
 
-            double rowDesiredWidth = OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth + OwningGrid.ColumnsInternal.FillerColumn.FillerWidth;
+            double rowDesiredWidth = OwningGrid.RowHeadersDesiredWidth + OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth + OwningGrid.ColumnsInternal.FillerColumn.FillerWidth;
             double topEdge = -OwningGrid.NegVerticalOffset;
             foreach (Control element in OwningGrid.DisplayData.GetScrollingElements())
             {