Fix AvaloniaUI#9565

- Only bring window to front if it's on the currently active space - Ensure correct order of child windows after fullscreen transition
donandren · Nov 29, 2022 · 5fa4da3 · 5fa4da3
1 parent ffe74ce
commit 5fa4da3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -136,7 +136,11 @@
 
         for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
         {
-            (*iterator)->BringToFront();
+            auto window = (*iterator)->Window;
+
+            // #9565: Only bring window to front if it's on the currently active space
+            if ([window isOnActiveSpace])
+                (*iterator)->BringToFront();
         }
     }
 }
@@ -160,6 +164,9 @@
 
 void WindowImpl::EndStateTransition() {
     _transitioningWindowState = false;
+
+    // Ensure correct order of child windows after fullscreen transition.
+    BringToFront();
 }
 
 SystemDecorations WindowImpl::Decorations() {