From 3f64463580526b60326118ec4b54b373db4ffa14 Mon Sep 17 00:00:00 2001 From: Zachary Wander Date: Thu, 13 Jul 2023 15:33:58 -0400 Subject: [PATCH] fix: better crossover windows detection --- src/api-wrappers/AXUIElement.swift | 2 +- src/api-wrappers/CGWindow.swift | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api-wrappers/AXUIElement.swift b/src/api-wrappers/AXUIElement.swift index a85b62e2..3a177cc5 100644 --- a/src/api-wrappers/AXUIElement.swift +++ b/src/api-wrappers/AXUIElement.swift @@ -215,7 +215,7 @@ extension AXUIElement { } private static func crossoverWindow(_ runningApp: NSRunningApplication, _ role: String?, _ subrole: String?, _ level: CGWindowLevel) -> Bool { - return runningApp.bundleIdentifier == nil && role == kAXWindowRole && subrole == kAXUnknownSubrole && level == CGWindow.baseLevel + return runningApp.bundleIdentifier == nil && role == kAXWindowRole && subrole == kAXUnknownSubrole && level == CGWindow.normalLevel && (runningApp.localizedName == "wine64-preloader" || runningApp.executableURL?.absoluteString.contains("/winetemp-") ?? false) } diff --git a/src/api-wrappers/CGWindow.swift b/src/api-wrappers/CGWindow.swift index 79def969..6a584af9 100644 --- a/src/api-wrappers/CGWindow.swift +++ b/src/api-wrappers/CGWindow.swift @@ -4,7 +4,6 @@ typealias CGWindow = [CFString: Any] extension CGWindow { static let normalLevel = CGWindowLevelForKey(.normalWindow) - static let baseLevel = CGWindowLevelForKey(.baseWindow) static let floatingWindow = CGWindowLevelForKey(.floatingWindow) static func windows(_ option: CGWindowListOption) -> [CGWindow] {