Generalize popup detection logic

nikitabobko · nikitabobko · commit c71c24329871 · 2025-07-16T22:21:26.000+02:00
diff --git a/Sources/AppBundle/util/AxUiElementMockEx.swift b/Sources/AppBundle/util/AxUiElementMockEx.swift
@@ -82,11 +82,7 @@ extension AxUiElementMock {
             return false
         }
 
-        if appBundleId == "com.nomachine.nxdock" && get(Ax.closeButtonAttr) == nil {
-            return false
-        }
-
-        if activationPolicy == .accessory && axApp.get(Ax.titleAttr) == "choose" && get(Ax.closeButtonAttr) == nil {
+        if activationPolicy == .accessory && get(Ax.closeButtonAttr) == nil {
             return false
         }
 
diff --git a/axDumps/apple_followup_sign_in_to_a_new_device_confirmation.json5 b/axDumps/apple_followup_sign_in_to_a_new_device_confirmation.json5
@@ -64,7 +64,7 @@
   "Aero.App.versionShort" : "1.0",
   "Aero.AxIgnored" : "AXChildrenInNavigationOrder, AXChildren, AXRoleDescription",
   "Aero.axWindowId" : 4015,
-  "Aero.AxUiElementWindowType" : "dialog",
+  "Aero.AxUiElementWindowType" : "popup",
   "Aero.AxUiElementWindowType_isDialogHeuristic" : true,
   "Aero.macOS.version" : "Version 15.5 (Build 24F74)",
   "Aero.on-window-detected" : [
diff --git a/axDumps/jetbrains_toolbox.json5 b/axDumps/jetbrains_toolbox.json5
@@ -55,7 +55,7 @@
   "Aero.AxIgnored" : "AXChildrenInNavigationOrder, AXChildren, AXRoleDescription",
   "Aero.axWindowId" : 14148,
   "Aero.AxUiElementWindowType_isDialogHeuristic" : true,
-  "Aero.AxUiElementWindowType" : "dialog",
+  "Aero.AxUiElementWindowType" : "popup",
   "Aero.on-window-detected" : [
 
   ],

Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,7 @@ extension AxUiElementMock {`
`82`	`82`	`return false`
`83`	`83`	`}`
`84`	`84`
`85`		`- if appBundleId == "com.nomachine.nxdock" && get(Ax.closeButtonAttr) == nil {`
`86`		`- return false`
`87`		`- }`
`88`		`-`
`89`		`- if activationPolicy == .accessory && axApp.get(Ax.titleAttr) == "choose" && get(Ax.closeButtonAttr) == nil {`
	`85`	`+ if activationPolicy == .accessory && get(Ax.closeButtonAttr) == nil {`
`90`	`86`	`return false`
`91`	`87`	`}`
`92`	`88`