Merge pull request #9716 from AvaloniaUI/fixes/macos-child-window-key…

…-handling macos: Fix child window key handling
AvaloniaUI · Jan 17, 2023 · 7d09e7c · 7d09e7c
1 parent fb67190
commit 7d09e7c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -43,7 +43,7 @@ -(void) setIsExtended:(bool)value;
 
 -(bool) isDialog
 {
-    return _parent->IsDialog();
+    return _parent->IsModal();
 }
 
 -(double) getExtendedTitleBarHeight
@@ -280,6 +280,9 @@ -(void)becomeKeyWindow
 
 - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
 {
+    if (_parent == nullptr)
+        return;
+
     _parent->BringToFront();
 
     dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -96,7 +96,7 @@ BEGIN_INTERFACE_MAP()
             IAvnClipboard *clipboard, IAvnDndResultCallback *cb,
             void *sourceHandle) override;
 
-    virtual bool IsDialog();
+    virtual bool IsModal();
 
     id<AvnWindowProtocol> GetWindowProtocol ();
 

diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -541,7 +541,7 @@
     return S_OK;
 }
 
-bool WindowBaseImpl::IsDialog() {
+bool WindowBaseImpl::IsModal() {
     return false;
 }
 

diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -23,7 +23,7 @@ class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, pub
     NSRect _preZoomSize;
     bool _transitioningWindowState;
     bool _isClientAreaExtended;
-    bool _isDialog;
+    bool _isModal;
     WindowImpl* _parent;
     std::list<WindowImpl*> _children;
     AvnExtendClientAreaChromeHints _extendClientHints;
@@ -91,7 +91,9 @@ BEGIN_INTERFACE_MAP()
 
     virtual HRESULT SetWindowState (AvnWindowState state) override;
 
-    virtual bool IsDialog() override;
+    virtual bool IsModal() override;
+
+    bool IsOwned();
 
     virtual void BringToFront () override;
 

diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -62,7 +62,7 @@
     START_COM_CALL;
 
     @autoreleasepool {
-        _isDialog = isDialog || _parent != nullptr;
+        _isModal = isDialog;
 
         WindowBaseImpl::Show(activate, isDialog);
 
@@ -96,7 +96,7 @@
 
         _parent = cparent;
 
-        _isDialog = _parent != nullptr;
+        _isModal = _parent != nullptr;
 
         if(_parent != nullptr && Window != nullptr){
             // If one tries to show a child window with a minimized parent window, then the parent window will be
@@ -122,7 +122,7 @@
     {
         if ([Window isVisible] && ![Window isMiniaturized])
         {
-            if(IsDialog())
+            if(IsModal())
             {
                 Activate();
             }
@@ -149,7 +149,7 @@
 {
     for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
     {
-        if((*iterator)->IsDialog())
+        if((*iterator)->IsModal())
         {
             return false;
         }
@@ -568,8 +568,12 @@
     }
 }
 
-bool WindowImpl::IsDialog() {
-    return _isDialog;
+bool WindowImpl::IsModal() {
+    return _isModal;
+}
+
+bool WindowImpl::IsOwned() {
+    return _parent != nullptr;
 }
 
 NSWindowStyleMask WindowImpl::GetStyle() {
@@ -598,7 +602,7 @@
             break;
     }
 
-    if (!IsDialog()) {
+    if (!IsOwned()) {
         s |= NSWindowStyleMaskMiniaturizable;
     }