node-mac-recorder 2.10.21 → 2.10.23

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.10.21",
+	"version": "2.10.23",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/window_selector.mm

@@ -108,29 +108,19 @@ void updateScreenOverlays();
                                                                   xRadius:8.0
                                                                   yRadius:8.0];
     
-    // Fill color and border based on toggle state
+    // Fill color only - no border
     NSColor *fillColor;
-    NSColor *strokeColor;
-    CGFloat lineWidth;
     
     if (self.isToggled) {
-        // Locked state: thicker border
-        fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4];
-        strokeColor = [NSColor colorWithRed:0.45 green:0.25 blue:0.75 alpha:0.9];
-        lineWidth = 3.0;
+        // Locked state: slightly different opacity
+        fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.5];
     } else {
-        // Normal state: thin border
+        // Normal state: standard fill
         fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4];
-        strokeColor = [NSColor whiteColor];
-        lineWidth = 1.0;
     }
     
     [fillColor setFill];
     [highlightPath fill];
-    
-    [strokeColor setStroke];
-    [highlightPath setLineWidth:lineWidth];
-    [highlightPath stroke];
 }
 
 - (void)updateAppearance {
@@ -201,6 +191,9 @@ void updateScreenOverlays();
     self = [super initWithFrame:frameRect];
     if (self) {
         self.isHovered = NO;
+        self.wantsLayer = YES;
+        // Set anchor point to center once for consistent scaling
+        self.layer.anchorPoint = CGPointMake(0.5, 0.5);
         [self setupHoverTracking];
     }
     return self;
@@ -218,17 +211,16 @@ void updateScreenOverlays();
 - (void)mouseEntered:(NSEvent *)event {
     self.isHovered = YES;
     [self animateScale:1.2 duration:0.15];
+    [[NSCursor pointingHandCursor] set];
 }
 
 - (void)mouseExited:(NSEvent *)event {
     self.isHovered = NO;
     [self animateScale:1.0 duration:0.15];
+    [[NSCursor arrowCursor] set];
 }
 
 - (void)animateScale:(CGFloat)scale duration:(NSTimeInterval)duration {
-    // Set anchor point to center for center-based scaling
-    self.layer.anchorPoint = CGPointMake(0.5, 0.5);
-    
     [NSAnimationContext beginGrouping];
     [NSAnimationContext currentContext].duration = duration;
     [NSAnimationContext currentContext].timingFunction = 
@@ -590,6 +582,13 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
         
         // Find window that contains the cursor point
         for (NSDictionary *window in g_allWindows) {
+            NSString *appName = [window objectForKey:@"appName"];
+            
+            // Skip Electron windows (our own overlay)
+            if (appName && ([appName containsString:@"Electron"] || [appName containsString:@"node"])) {
+                continue;
+            }
+            
             int x = [[window objectForKey:@"x"] intValue];
             int y = [[window objectForKey:@"y"] intValue];
             int width = [[window objectForKey:@"width"] intValue];
@@ -933,7 +932,8 @@ void updateOverlay() {
             }
             
             [g_overlayWindow orderFront:nil];
-            [g_overlayWindow makeKeyAndOrderFront:nil];
+            // DON'T make key - prevents focus ring
+            // [g_overlayWindow makeKeyAndOrderFront:nil];
             
             // Ensure subviews (except overlay view itself) have no borders after positioning
             for (NSView *subview in [g_overlayWindow.contentView subviews]) {
@@ -1054,7 +1054,7 @@ bool showRecordingPreview(NSDictionary *windowInfo) {
         [g_recordingPreviewWindow setAcceptsMouseMovedEvents:NO];
         [g_recordingPreviewWindow setHasShadow:NO];
         [g_recordingPreviewWindow setAlphaValue:1.0];
-        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_recordingPreviewWindow setTitlebarAppearsTransparent:YES];
@@ -1183,7 +1183,7 @@ void updateScreenOverlays() {
                 // Ensure ALL overlays are visible, but active one is on top
                 [overlayWindow orderFront:nil];
                 if (isActiveScreen) {
-                    [overlayWindow makeKeyAndOrderFront:nil];
+                    [overlayWindow orderFront:nil]; // Don't make key
                 } else {
                     [overlayWindow orderFront:nil]; // Keep inactive screens visible too
                 }
@@ -1328,7 +1328,7 @@ bool startScreenSelection() {
             [overlayWindow setHasShadow:NO];
             [overlayWindow setAlphaValue:1.0];
             // Ensure window appears on all spaces and stays put - match g_overlayWindow
-            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
             
             // Remove any default window decorations and borders
             [overlayWindow setTitlebarAppearsTransparent:YES];
@@ -1501,12 +1501,12 @@ bool startScreenSelection() {
             // Show overlay - different strategy for secondary screens
             if (i == 0) {
                 // Primary screen
-                [overlayWindow makeKeyAndOrderFront:nil];
+                [overlayWindow orderFront:nil]; // Don't make key
                 // Primary screen overlay shown
             } else {
                 // Secondary screens - more aggressive approach
                 [overlayWindow orderFront:nil];
-                [overlayWindow makeKeyAndOrderFront:nil]; // Try makeKey too
+                [overlayWindow orderFront:nil]; // Don't make key // Try makeKey too
                 [overlayWindow setLevel:CGWindowLevelForKey(kCGMaximumWindowLevelKey)]; // Match g_overlayWindow level
                 
                 // Secondary screen overlay shown
@@ -1514,7 +1514,7 @@ bool startScreenSelection() {
                 // Double-check with delayed re-show
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [overlayWindow orderFront:nil];
-                    [overlayWindow makeKeyAndOrderFront:nil];
+                    [overlayWindow orderFront:nil]; // Don't make key
                 });
             }
             
@@ -1628,7 +1628,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
             // no border
             [overlayWindow setStyleMask:NSWindowStyleMaskBorderless];
             [overlayWindow setAlphaValue:1.0];
-            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
             
 
             // Force content view to have no borders
@@ -1651,7 +1651,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
 
 
             [overlayWindow orderFront:nil];
-            [overlayWindow makeKeyAndOrderFront:nil];
+            // [overlayWindow makeKeyAndOrderFront:nil];
             
             // Note: NSWindow doesn't have setWantsLayer method, only NSView does
             
@@ -1724,7 +1724,7 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_overlayWindow setAcceptsMouseMovedEvents:YES];
         [g_overlayWindow setHasShadow:NO];
         [g_overlayWindow setAlphaValue:1.0];
-        [g_overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary | NSWindowCollectionBehaviorIgnoresCycle];
+        [g_overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_overlayWindow setTitlebarAppearsTransparent:YES];