From bb4287e22de38014cc6ba05e94c104188f68725e Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 15 Jul 2022 13:28:29 +0200 Subject: [PATCH 1/3] 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 5d82689eff..d906cd359c 100644 --- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs +++ b/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()) { From c3bb062a3705341666649aa5a949ccdd4b543faa Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 15 Jul 2022 14:08:29 +0100 Subject: [PATCH 2/3] ensure bundle id is registered. --- .../Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh index b03a8a7a69..e60eb47a81 100755 --- a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh +++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh @@ -7,9 +7,12 @@ pkill node appium & pkill IntegrationTestApp ./build.sh CompileNative +rm -rf ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app +open -b net.avaloniaui.avalonia.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 From e8914c966d8f33be44df6007114569d4099072b4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 15 Jul 2022 14:17:55 +0100 Subject: [PATCH 3/3] reliably replace old bundle. --- azure-pipelines-integrationtests.yml | 2 ++ .../macos-clean-build-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 10f098b607..0b79758c76 100644 --- a/azure-pipelines-integrationtests.yml +++ b/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 diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh index e60eb47a81..14e765d16a 100755 --- a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh +++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh @@ -7,8 +7,8 @@ pkill node appium & pkill IntegrationTestApp ./build.sh CompileNative -rm -rf ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app -open -b net.avaloniaui.avalonia.integrationtestapp +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