Set the window as main before activating the app

_fixes #101
nikitabobko · Jun 1, 2024 · 4701a5c · 4701a5c
1 parent b3ede59
commit 4701a5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Sources/AppBundle/tree/MacWindow.swift b/Sources/AppBundle/tree/MacWindow.swift
@@ -95,9 +95,11 @@ final class MacWindow: Window, CustomStringConvertible {
     override var isMacosMinimized: Bool { axWindow.get(Ax.minimizedAttr) == true }
 
     @discardableResult
-    override func nativeFocus() -> Bool { // todo make focus reliable: make async + active waiting
-        // Raise firstly to make sure that by that time we activate the app, particular window would be already on top
-        axWindow.raise() && macApp.nsApp.activate(options: .activateIgnoringOtherApps)
+    override func nativeFocus() -> Bool {
+        // Raise firstly to make sure that by the time we activate the app, the window would be already on top
+        axWindow.set(Ax.isMainAttr, true) &&
+            axWindow.raise() &&
+            macApp.nsApp.activate(options: .activateIgnoringOtherApps)
     }
 
     override func close() -> Bool {

diff --git a/Sources/AppBundle/util/accessibility.swift b/Sources/AppBundle/util/accessibility.swift
@@ -226,9 +226,10 @@ enum Ax {
         key: kAXFocusedAttribute,
         getter: { $0 as? Bool }
     )
-    static let isMainAttr = ReadableAttrImpl<Bool>(
+    static let isMainAttr = WritableAttrImpl<Bool>(
         key: kAXMainAttribute,
-        getter: { $0 as? Bool }
+        getter: { $0 as? Bool },
+        setter: { $0 as CFTypeRef }
     )
     static let sizeAttr = WritableAttrImpl<CGSize>(
         key: kAXSizeAttribute,