Merge pull request #10153 from AvaloniaUI/fixes/macos-windowstate-crash

macOS: Sync actual window state after window show, and fix integration tests on macOS 13.1
AvaloniaUI · Feb 1, 2023 · e1c6271 · e1c6271
2 parents 5896e33 + 585ab62
commit e1c6271
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -66,7 +66,7 @@
         _isModal = isDialog;
 
         WindowBaseImpl::Show(activate, isDialog);
-
+        GetWindowState(&_actualWindowState);
         HideOrShowTrafficLights();
 
         return SetWindowState(_lastWindowState);

diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -118,7 +118,16 @@ public static IDisposable OpenWindowWithClick(this AppiumWebElement element)
                 Thread.Sleep(1000);
 
                 var newWindows = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow"));
-                var newWindowTitles = newWindows.ToDictionary(x => x.Text);
+
+                // Try to find the new window by looking for a window with a title that didn't exist before the button
+                // was clicked. Sometimes it seems that when a window becomes fullscreen, all other windows in the
+                // application lose their titles, so filter out windows with no title (this may have started happening
+                // with macOS 13.1?)
+                var newWindowTitles = newWindows
+                    .Select(x => (x.Text, x))
+                    .Where(x => !string.IsNullOrEmpty(x.Text))
+                    .ToDictionary(x => x.Text, x => x.x);
+
                 var newWindowTitle = Assert.Single(newWindowTitles.Keys.Except(oldWindowTitles.Keys));
 
                 return Disposable.Create(() =>