Merge branch 'master' into effectiveViewportChangedListeners

azure-pipelines-integrationtests.yml

@@ -0,0 +1,48 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+jobs:
+- job: Mac
+  pool:
+    name: 'AvaloniaMacPool'
+
+  steps:
+  - script: ./tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
+    displayName: 'run integration tests'
+
+
+- job: Windows
+  pool:
+    vmImage: 'windows-2022'
+
+  steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 6.0.202'
+    inputs:
+      version: 6.0.202
+
+  - task: Windows Application Driver@0
+    inputs:
+      OperationType: 'Start'
+      AgentResolution: '4K'
+    displayName: 'Start WinAppDriver'
+  
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'build'
+      projects: 'samples/IntegrationTestApp/IntegrationTestApp.csproj'
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'test'
+      projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj'
+
+  - task: Windows Application Driver@0
+    inputs:
+      OperationType: 'Stop'
+    displayName: 'Stop WinAppDriver'

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -870,7 +870,14 @@ namespace Avalonia.Win32
             if (fullscreen)
             {
                 GetWindowRect(_hwnd, out var windowRect);
-                _savedWindowInfo.WindowRect = windowRect;
+                GetClientRect(_hwnd, out var clientRect);
+
+                clientRect.left += windowRect.left;
+                clientRect.right += windowRect.left;
+                clientRect.top += windowRect.top;
+                clientRect.bottom += windowRect.top;
+                
+                _savedWindowInfo.WindowRect = clientRect;
 
                 var current = GetStyle();
                 var currentEx = GetExtendedStyle();
@@ -907,10 +914,10 @@ namespace Avalonia.Win32
                 SetExtendedStyle(_savedWindowInfo.ExStyle, false);
 
                 // On restore, resize to the previous saved rect size.
-                var new_rect = _savedWindowInfo.WindowRect.ToPixelRect();
+                var newClientRect = _savedWindowInfo.WindowRect.ToPixelRect();
 
-                SetWindowPos(_hwnd, IntPtr.Zero, new_rect.X, new_rect.Y, new_rect.Width,
-                             new_rect.Height,
+                SetWindowPos(_hwnd, IntPtr.Zero, newClientRect.X, newClientRect.Y, newClientRect.Width,
+                             newClientRect.Height,
                             SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
 
                 UpdateWindowProperties(_windowProperties, true);

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

@@ -5,4 +5,5 @@ cd "$SCRIPT_DIR"/../.. || exit
 git clean -xdf
 ./build.sh CompileNative
 ./samples/IntegrationTestApp/bundle.sh
+open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app
 dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed"