[macOS] Prevent popups from stealing focus (#17794)

AvaloniaUI · Dec 19, 2024 · aa9ce85 · aa9ce85
1 parent f29675d
commit aa9ce85
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -42,6 +42,15 @@ virtual HRESULT Show(bool activate, bool isDialog) override
 
         return WindowBaseImpl::Show(activate, true);
     }
+
+    virtual bool ShouldTakeFocusOnShow() override
+    {
+        // Don't steal the focus from another windows if our parent is inactive
+        if (Parent != nullptr && Parent->Window != nullptr && ![Parent->Window isKeyWindow])
+            return false;
+
+        return WindowBaseImpl::ShouldTakeFocusOnShow();
+    }
 };