Simplify HSapplication:isFrontmost. It worked before, but always fail…

…ed in tests. This seems to improve that
Hammerspoon · Mar 3, 2021 · 24e0b05 · 24e0b05
1 parent 972a516
commit 24e0b05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/Hammerspoon Tests/HSapplication.m b/Hammerspoon Tests/HSapplication.m
@@ -46,8 +46,6 @@ - (void)testBasicAttributes {
 // }
 
 - (void)testFrontmostApplication {
-    SKIP_IN_TRAVIS()
-    SKIP_IN_GITHUB_ACTIONS()
     RUN_LUA_TEST()
 }
 

diff --git a/Hammerspoon/HSuicore.m b/Hammerspoon/HSuicore.m
@@ -230,20 +230,10 @@ -(BOOL)setFrontmost:(BOOL)allWindows {
 }
 
 -(BOOL)isFrontmost {
-    CFTypeRef _isFrontmost;
-    NSNumber* isFrontmost = @NO;
+    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+    NSRunningApplication *frontmostApp = workspace.frontmostApplication;
 
-    if (kAXErrorSuccess == AXUIElementCopyAttributeValue(self.elementRef,
-                                                         (CFStringRef)NSAccessibilityFrontmostAttribute,
-                                                         &_isFrontmost)) {
-        isFrontmost = (__bridge_transfer NSNumber *)_isFrontmost;
-//     } else {
-//         [LuaSkin logError:[NSString stringWithFormat:@"Unable to fetch element attribute NSAccessibilityFrontmostAttribute for: %@", [self.runningApp localizedName]]];
-    }
-
-    [LuaSkin logBreadcrumb:[NSString stringWithFormat:@"FRONTMOST: %@:%@:%@", self.title, isFrontmost, AXIsProcessTrusted() ? @"YES" : @"NO"]];
-
-    return isFrontmost.boolValue;
+    return frontmostApp == self.runningApp;
 }
 
 -(NSString *)title {