Make sure that special treatment for Firefox windows works for all Fi…

…refox editions _closes #1108 closes #1130 - Works for Firefox, Firefox Developer Edition, and Firefox Nightly version Co-authored-by: fullmetalsheep <[email protected]>
nikitabobko · Feb 23, 2025 · 732927b · 732927b
1 parent ce6628e
commit 732927b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sources/AppBundle/tree/AbstractApp.swift b/Sources/AppBundle/tree/AbstractApp.swift
@@ -32,6 +32,10 @@ class AbstractApp: Hashable {
 
 extension AbstractApp {
     func asMacApp() -> MacApp { self as! MacApp }
+
+    func isFirefox() -> Bool {
+        ["org.mozilla.firefox", "org.mozilla.firefoxdeveloperedition", "org.mozilla.nightly"].contains(id ?? "")
+    }
 }
 
 extension Window {

diff --git a/Sources/AppBundle/tree/MacWindow.swift b/Sources/AppBundle/tree/MacWindow.swift
@@ -261,7 +261,7 @@ func isWindow(_ axWindow: AXUIElement, _ app: MacApp) -> Bool {
         return false
     }
 
-    if app.id == "org.mozilla.firefox" {
+    if app.isFirefox() {
         return isWindowNew(axWindow, app)
     }
 
@@ -310,7 +310,7 @@ func isDialogHeuristic(_ axWindow: AXUIElement, _ app: MacApp) -> Bool {
     }
     // Firefox: Picture in Picture window doesn't have minimize button.
     // todo. bug: when firefox shows non-native fullscreen, minimize button disables for all other windows
-    if app.id == "org.mozilla.firefox" && axWindow.get(Ax.minimizeButtonAttr)?.get(Ax.enabledAttr) != true {
+    if app.isFirefox() && axWindow.get(Ax.minimizeButtonAttr)?.get(Ax.enabledAttr) != true {
         return true
     }
     if app.id == "com.apple.PhotoBooth" { return true }