Merge branch 'master' into rndr4

azure-pipelines-integrationtests.yml

@@ -19,6 +19,8 @@ jobs:
       appium &
       pkill IntegrationTestApp
       ./build.sh CompileNative
+      rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
+      pkill IntegrationTestApp
       ./samples/IntegrationTestApp/bundle.sh
       open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app
       pkill IntegrationTestApp

src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs

@@ -97,7 +97,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())
             {

tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh

@@ -7,9 +7,12 @@ pkill node
 appium &
 pkill IntegrationTestApp
 ./build.sh CompileNative
+rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")")
+pkill IntegrationTestApp
 ./samples/IntegrationTestApp/bundle.sh
 open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app
 pkill IntegrationTestApp
+open -b net.avaloniaui.avalonia.integrationtestapp
 dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed"
 pkill IntegrationTestApp
 pkill node