node-mac-recorder 2.6.5 → 2.6.7

package/package.json

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

package/src/window_selector.mm

@@ -53,6 +53,7 @@ void updateScreenOverlays();
 // Custom overlay view class
 @interface WindowSelectorOverlayView : NSView
 @property (nonatomic, strong) NSDictionary *windowInfo;
+@property (nonatomic) BOOL isActiveWindow;
 @end
 
 @implementation WindowSelectorOverlayView
@@ -65,6 +66,7 @@ void updateScreenOverlays();
         // Ensure no borders or decorations
         self.layer.borderWidth = 0.0;
         self.layer.cornerRadius = 0.0;
+        self.isActiveWindow = YES; // Default to active for current window under mouse
     }
     return self;
 }
@@ -74,12 +76,15 @@ void updateScreenOverlays();
     
     if (!self.windowInfo) return;
     
-    // Background with transparency - purple tone (no border)
-    [[NSColor colorWithRed:0.5 green:0.3 blue:0.8 alpha:0.25] setFill];
+    // Background with transparency - same style as screen overlay
+    if (self.isActiveWindow) {
+        // Active window: brighter, more opaque (same as active screen)
+        [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] setFill];
+    } else {
+        // Inactive window: dimmer, less opaque (same as inactive screen)
+        [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] setFill];
+    }
     NSRectFill(self.bounds);
-    
-    // Ensure no borders or frames are drawn
-    // Text will be handled by separate label above button
 }
 
 @end
@@ -175,13 +180,7 @@ void updateScreenOverlays();
     }
     NSRectFill(self.bounds);
     
-    // Add subtle border for active screen
-    if (self.isActiveScreen) {
-        [[NSColor colorWithRed:0.7 green:0.5 blue:1.0 alpha:0.6] setStroke];
-        NSBezierPath *borderPath = [NSBezierPath bezierPathWithRect:NSInsetRect(self.bounds, 2, 2)];
-        [borderPath setLineWidth:4.0];
-        [borderPath stroke];
-    }
+    // No border for clean look
 }
 
 @end
@@ -472,10 +471,13 @@ void updateOverlay() {
             if (!windowScreen) windowScreen = [NSScreen mainScreen];
             
             // Convert coordinates from CGWindow (top-left) to NSWindow (bottom-left) for the specific screen
-            CGFloat screenHeight = [windowScreen frame].size.height;
+            NSRect screenFrame = [windowScreen frame];
+            CGFloat screenHeight = screenFrame.size.height;
             CGFloat adjustedY = screenHeight - y - height;
             
-            // Use actual window coordinates without clamping to preserve overlay accuracy
+            // Window coordinates are in global space, overlay frame should be screen-relative
+            // Keep X coordinate as-is (already in global space which is what we want)
+            // Only convert Y from top-left to bottom-left coordinate system
             NSRect overlayFrame = NSMakeRect(x, adjustedY, width, height);
             
             NSString *windowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Untitled";
@@ -943,12 +945,24 @@ bool startScreenSelection() {
             [screenInfoArray addObject:screenInfo];
             
             // Create overlay window for this screen (FULL screen including menu bar)
-            // IMPORTANT: Explicitly assign to specific screen
-            NSWindow *overlayWindow = [[NSWindow alloc] initWithContentRect:screenFrame
-                                                                  styleMask:NSWindowStyleMaskBorderless
-                                                                    backing:NSBackingStoreBuffered
-                                                                      defer:NO
-                                                                      screen:screen];
+            // For secondary screens, don't specify screen parameter to avoid issues
+            NSWindow *overlayWindow;
+            if (i == 0) {
+                // Primary screen - use screen parameter
+                overlayWindow = [[NSWindow alloc] initWithContentRect:screenFrame
+                                                            styleMask:NSWindowStyleMaskBorderless
+                                                              backing:NSBackingStoreBuffered
+                                                                defer:NO
+                                                               screen:screen];
+            } else {
+                // Secondary screens - create without screen param, set frame manually
+                overlayWindow = [[NSWindow alloc] initWithContentRect:screenFrame
+                                                            styleMask:NSWindowStyleMaskBorderless
+                                                              backing:NSBackingStoreBuffered
+                                                                defer:NO];
+                // Force specific positioning for secondary screen
+                [overlayWindow setFrameOrigin:screenFrame.origin];
+            }
             
             // Window created for specific screen
             
@@ -1126,17 +1140,23 @@ bool startScreenSelection() {
             // Ensure window frame is correct for this screen
             [overlayWindow setFrame:screenFrame display:YES animate:NO];
             
-            // Show overlay - for secondary screens, avoid makeKeyAndOrderFront initially
+            // Show overlay - different strategy for secondary screens
             if (i == 0) {
-                // Primary screen - can be key window
+                // Primary screen
                 [overlayWindow makeKeyAndOrderFront:nil];
+                // Primary screen overlay shown
             } else {
-                // Secondary screens - just order front first
+                // Secondary screens - more aggressive approach
                 [overlayWindow orderFront:nil];
-                // Small delay to ensure window is created on correct screen
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [overlayWindow makeKeyAndOrderFront:nil]; // Try makeKey too
+                [overlayWindow setLevel:CGWindowLevelForKey(kCGFloatingWindowLevelKey) + 2000]; // Even higher level
+                
+                // Secondary screen overlay shown
+                
+                // 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 setOrderedIndex:0]; // Bring to very front
+                    [overlayWindow makeKeyAndOrderFront:nil];
                 });
             }