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

macOS: Fix window order breaking when closing modal dialog
3 years ago · 8096b59e21
1 changed files with 4 additions and 2 deletions
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@ -291,12 +291,14 @@
 {
    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{
        }