Fix more macos window issues and add more integration tests.

native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

@@ -224,7 +224,7 @@
         if (ret == nullptr)
             return E_POINTER;
 
-        if(Window != nullptr){
+        if(Window != nullptr && _shown){
             auto frame = [Window frame];
             ret->Width = frame.size.width;
             ret->Height = frame.size.height;

native/Avalonia.Native/src/OSX/WindowImpl.mm

@@ -119,13 +119,16 @@
 {
     if(Window != nullptr)
     {
-        if(IsDialog())
+        if (![Window isMiniaturized])
         {
-            Activate();
-        }
-        else
-        {
-            [Window orderFront:nullptr];
+            if(IsDialog())
+            {
+                Activate();
+            }
+            else
+            {
+                [Window orderFront:nullptr];
+            }
         }
 
         [Window invalidateShadow];
@@ -488,6 +491,8 @@
         }
 
         if (_shown) {
+            _actualWindowState = _lastWindowState;
+
             switch (state) {
                 case Maximized:
                     if (currentState == FullScreen) {
@@ -545,7 +550,6 @@
                     break;
             }
 
-            _actualWindowState = _lastWindowState;
             WindowEvents->WindowStateChanged(_actualWindowState);
         }
 

samples/IntegrationTestApp/MainWindow.axaml

@@ -112,6 +112,7 @@
           <Button Name="ShowWindow">Show Window</Button>
           <Button Name="SendToBack">Send to Back</Button>
           <Button Name="ExitFullscreen">Exit Fullscreen</Button>
+          <Button Name="RestoreAll">Restore All</Button>
         </StackPanel>
       </TabItem>
     </TabControl>

samples/IntegrationTestApp/MainWindow.axaml.cs

@@ -82,7 +82,7 @@ private void ShowWindow()
                     break;
             }
         }
-        
+
         private void SendToBack()
         {
             var lifetime = (ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!;
@@ -92,7 +92,18 @@ private void SendToBack()
                 window.Activate();
             }
         }
-
+
+        private void RestoreAll()
+        {
+            var lifetime = (ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!;
+
+            foreach (var window in lifetime.Windows)
+            {
+                if (window.WindowState == WindowState.Minimized)
+                    window.WindowState = WindowState.Normal;
+            }
+        }
+
         private void MenuClicked(object? sender, RoutedEventArgs e)
         {
             var clickedMenuItemTextBlock = this.FindControl<TextBlock>("ClickedMenuItem");
@@ -117,6 +128,8 @@ private void OnButtonClick(object? sender, RoutedEventArgs e)
                 SendToBack();
             if (source?.Name == "ExitFullscreen")
                 WindowState = WindowState.Normal;
+            if (source?.Name == "RestoreAll")
+                RestoreAll();
         }
     }
 }

samples/IntegrationTestApp/ShowWindowTest.axaml

@@ -3,12 +3,14 @@
         x:Class="IntegrationTestApp.ShowWindowTest"
         Name="SecondaryWindow"
         Title="Show Window Test">
-  <Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+  <Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
     <Label Grid.Column="0" Grid.Row="1">Client Size</Label>
-    <TextBox Name="ClientSize" Grid.Column="1" Grid.Row="1" IsReadOnly="True"/>
+    <TextBox Name="ClientSize" Grid.Column="1" Grid.Row="1" IsReadOnly="True"
+             Text="{Binding ClientSize, Mode=OneWay}"/>
 
     <Label Grid.Column="0" Grid.Row="2">Frame Size</Label>
-    <TextBox Name="FrameSize" Grid.Column="1" Grid.Row="2" IsReadOnly="True"/>
+    <TextBox Name="FrameSize" Grid.Column="1" Grid.Row="2" IsReadOnly="True"
+             Text="{Binding FrameSize, Mode=OneWay}"/>
 
     <Label Grid.Column="0" Grid.Row="3">Position</Label>
     <TextBox Name="Position" Grid.Column="1" Grid.Row="3" IsReadOnly="True"/>
@@ -21,5 +23,13 @@
 
     <Label Grid.Column="0" Grid.Row="6">Scaling</Label>
     <TextBox Name="Scaling" Grid.Column="1" Grid.Row="6" IsReadOnly="True"/>
+
+    <Label Grid.Column="0" Grid.Row="7">WindowState</Label>
+    <ComboBox Name="WindowState" Grid.Column="1" Grid.Row="7" SelectedIndex="{Binding WindowState}">
+      <ComboBoxItem>Normal</ComboBoxItem>
+      <ComboBoxItem>Minimized</ComboBoxItem>
+      <ComboBoxItem>Maximized</ComboBoxItem>
+      <ComboBoxItem>Fullscreen</ComboBoxItem>
+    </ComboBox>
   </Grid>
 </Window>

samples/IntegrationTestApp/ShowWindowTest.axaml.cs

@@ -1,4 +1,5 @@
 using System;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
@@ -11,6 +12,8 @@ public class ShowWindowTest : Window
         public ShowWindowTest()
         {
             InitializeComponent();
+            DataContext = this;
+            PositionChanged += (s, e) => this.GetControl<TextBox>("Position").Text = $"{Position}";
         }
 
         private void InitializeComponent()
@@ -21,17 +24,16 @@ private void InitializeComponent()
         protected override void OnOpened(EventArgs e)
         {
             base.OnOpened(e);
-            this.GetControl<TextBox>("ClientSize").Text = $"{Width}, {Height}";
-            this.GetControl<TextBox>("FrameSize").Text = $"{FrameSize}";
+            var scaling = PlatformImpl!.DesktopScaling;
             this.GetControl<TextBox>("Position").Text = $"{Position}";
             this.GetControl<TextBox>("ScreenRect").Text = $"{Screens.ScreenFromVisual(this)?.WorkingArea}";
-            this.GetControl<TextBox>("Scaling").Text = $"{PlatformImpl?.DesktopScaling}";
+            this.GetControl<TextBox>("Scaling").Text = $"{scaling}";
 
             if (Owner is not null)
             {
                 var ownerRect = this.GetControl<TextBox>("OwnerRect");
                 var owner = (Window)Owner;
-                ownerRect.Text = $"{owner.Position}, {owner.FrameSize}";
+                ownerRect.Text = $"{owner.Position}, {PixelSize.FromSize(owner.FrameSize!.Value, scaling)}";
             }
         }
     }

src/Avalonia.Controls/Window.cs

@@ -901,10 +901,10 @@ Owner is Window ownerWindow &&
             {
                 if (owner != null)
                 {
-                    // TODO: We really need non-client size here.
+                    var ownerSize = owner.FrameSize ?? owner.ClientSize;
                     var ownerRect = new PixelRect(
                         owner.Position,
-                        PixelSize.FromSize(owner.ClientSize, scaling));
+                        PixelSize.FromSize(ownerSize, scaling));
                     Position = ownerRect.CenterRect(rect).Position;
                 }
             }

tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs

@@ -130,17 +130,10 @@ public static IDisposable OpenWindowWithClick(this AppiumWebElement element)
 
         public static void SendClick(this AppiumWebElement element)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                element.Click();
-            }
-            else
-            {
-                // The Click() method seems to correspond to accessibilityPerformPress on macOS but certain controls
-                // such as list items don't support this action, so instead simulate a physical click as VoiceOver
-                // does.
-                new Actions(element.WrappedDriver).MoveToElement(element).Click().Perform();
-            }
+            // The Click() method seems to correspond to accessibilityPerformPress on macOS but certain controls
+            // such as list items don't support this action, so instead simulate a physical click as VoiceOver
+            // does. On Windows, Click() seems to fail with the WindowState checkbox for some reason.
+            new Actions(element.WrappedDriver).MoveToElement(element).Click().Perform();
         }
 
         public static void MovePointerOver(this AppiumWebElement element)

tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+    internal class PlatformTheoryAttribute : TheoryAttribute
+    {
+        public PlatformTheoryAttribute(TestPlatforms platforms = TestPlatforms.All) => Platforms = platforms;
+
+        public TestPlatforms Platforms { get; }
+
+        public override string? Skip
+        {
+            get => IsSupported() ? null : $"Ignored on {RuntimeInformation.OSDescription}";
+            set => throw new NotSupportedException();
+        }
+
+        private bool IsSupported()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                return Platforms.HasAnyFlag(TestPlatforms.Windows);
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                return Platforms.HasAnyFlag(TestPlatforms.MacOS);
+            return false;
+        }
+    }
+}