Merge pull request AvaloniaUI#10427 from AvaloniaUI/fixes/macos-close…

…-window-zorder macOS: Fix window order breaking when closing modal dialog
donandren · Feb 24, 2023 · 8096b59 · 8096b59
1 parent a5f20fb
commit 8096b59
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -291,12 +291,14 @@ - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
 {
     if (_parent == nullptr)
         return;
-        
+
     _parent->BringToFront();
 
     dispatch_async(dispatch_get_main_queue(), ^{
         @try {
-        [self invalidateShadow];
+            [self invalidateShadow];
+            if (self->_parent != nullptr)
+                self->_parent->BringToFront();
         }
         @finally{
         }