From e4bbebac7d0e1f97f9864439f67e50e797110a85 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 24 May 2022 20:48:19 +0100
Subject: [PATCH] restore _canBecomeKeyWindow flag, important to distinguish
 behavior of a window and a popup.

---
 native/Avalonia.Native/src/OSX/AvnWindow.mm | 34 +++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 54bfe6e38a..7c1f548786 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -31,6 +31,7 @@
     ComPtr<WindowBaseImpl> _parent;
     bool _closed;
     bool _isEnabled;
+    bool _canBecomeKeyWindow;
     bool _isExtended;
     AvnMenu* _menu;
 }
@@ -216,29 +217,38 @@
 
 -(BOOL)canBecomeKeyWindow
 {
-    // If the window has a child window being shown as a dialog then don't allow it to become the key window.
-    for(NSWindow* uch in [self childWindows])
+    if(_canBecomeKeyWindow)
     {
-        if (![uch conformsToProtocol:@protocol(AvnWindowProtocol)])
+        // If the window has a child window being shown as a dialog then don't allow it to become the key window.
+        for(NSWindow* uch in [self childWindows])
         {
-            continue;
-        }
+            if (![uch conformsToProtocol:@protocol(AvnWindowProtocol)])
+            {
+                continue;
+            }
 
-        id <AvnWindowProtocol> ch = (id <AvnWindowProtocol>) uch;
+            id <AvnWindowProtocol> ch = (id <AvnWindowProtocol>) uch;
 
-        return !ch.isDialog;
-    }
+            if(ch.isDialog)
+                return true;
+        }
 
-    return true;
+        return true;
+    }
+    
+    return false;
 }
 
+#ifndef IS_NSPANEL
 -(BOOL)canBecomeMainWindow
 {
-#ifdef IS_NSPANEL
-    return false;
-#else
     return true;
+}
 #endif
+
+-(void)setCanBecomeKeyWindow:(bool)value
+{
+    _canBecomeKeyWindow = value;
 }
 
 -(bool)shouldTryToHandleEvents