node-mac-recorder 2.5.1 → 2.5.3

package/package.json

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

package/src/window_selector.mm

@@ -67,14 +67,14 @@ bool hideScreenRecordingPreview();
     
     if (!self.windowInfo) return;
     
-    // Background with transparency
-    [[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.3] setFill];
+    // Background with transparency - purple tone
+    [[NSColor colorWithRed:0.4 green:0.3 blue:0.8 alpha:0.08] setFill];
     NSRectFill(self.bounds);
     
-    // Modern border with rounded corners
-    [[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.8] setStroke];
-    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 2, 2) xRadius:12 yRadius:12];
-    [border setLineWidth:4.0];
+    // Ultra-thin border with darker purple
+    [[NSColor colorWithRed:0.5 green:0.3 blue:0.7 alpha:0.4] setStroke];
+    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 0.125, 0.125) xRadius:12 yRadius:12];
+    [border setLineWidth:0.25];
     [border stroke];
     
     // Text will be handled by separate label above button
@@ -155,14 +155,14 @@ bool hideScreenRecordingPreview();
     
     if (!self.screenInfo) return;
     
-    // Background with transparency
-    [[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.25] setFill];
+    // Background with transparency - purple tone
+    [[NSColor colorWithRed:0.4 green:0.3 blue:0.8 alpha:0.12] setFill];
     NSRectFill(self.bounds);
     
-    // Modern border with rounded corners
-    [[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.7] setStroke];
-    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 3, 3) xRadius:15 yRadius:15];
-    [border setLineWidth:6.0];
+    // Ultra-thin border with darker purple
+    [[NSColor colorWithRed:0.5 green:0.3 blue:0.7 alpha:0.3] setStroke];
+    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 0.125, 0.125) xRadius:15 yRadius:15];
+    [border setLineWidth:0.25];
     [border stroke];
     
     // Text will be handled by separate label above button
@@ -504,17 +504,56 @@ void updateOverlay() {
                 [infoLabel setAlignment:NSTextAlignmentCenter];
                 [infoLabel setFont:[NSFont systemFontOfSize:18 weight:NSFontWeightMedium]];
                 [infoLabel setTextColor:[NSColor whiteColor]];
-                [infoLabel setWantsLayer:YES];
-                
-                // Add shadow for better visibility
-                [infoLabel.layer setShadowColor:[[NSColor blackColor] CGColor]];
-                [infoLabel.layer setShadowOffset:NSMakeSize(0, -1)];
-                [infoLabel.layer setShadowRadius:3.0];
-                [infoLabel.layer setShadowOpacity:0.8];
                 
                 [g_overlayWindow.contentView addSubview:infoLabel];
             }
             
+            // Add/update app icon
+            NSImageView *appIconView = nil;
+            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
+                if ([subview isKindOfClass:[NSImageView class]]) {
+                    appIconView = (NSImageView*)subview;
+                    break;
+                }
+            }
+            
+            if (!appIconView) {
+                appIconView = [[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 96, 96)];
+                [appIconView setImageScaling:NSImageScaleProportionallyUpOrDown];
+                [appIconView setWantsLayer:YES];
+                [appIconView.layer setCornerRadius:16.0];
+                [appIconView.layer setMasksToBounds:YES];
+                [appIconView.layer setBackgroundColor:[[NSColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.3] CGColor]]; // Debug background
+                [g_overlayWindow.contentView addSubview:appIconView];
+                NSLog(@"🖼️ Created app icon view at frame: (%.0f, %.0f, %.0f, %.0f)", 
+                      appIconView.frame.origin.x, appIconView.frame.origin.y, 
+                      appIconView.frame.size.width, appIconView.frame.size.height);
+            }
+            
+            // Get app icon using NSWorkspace
+            NSString *iconAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
+            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+            NSArray *runningApps = [workspace runningApplications];
+            NSImage *appIcon = nil;
+            
+            for (NSRunningApplication *app in runningApps) {
+                if ([[app localizedName] isEqualToString:iconAppName] || [[app bundleIdentifier] containsString:iconAppName]) {
+                    appIcon = [app icon];
+                    break;
+                }
+            }
+            
+            // Fallback to generic app icon if not found
+            if (!appIcon) {
+                appIcon = [workspace iconForFileType:NSFileTypeForHFSTypeCode(kGenericApplicationIcon)];
+                NSLog(@"⚠️ Using fallback icon for app: %@", iconAppName);
+            } else {
+                NSLog(@"✅ Found app icon for: %@", iconAppName);
+            }
+            
+            [appIconView setImage:appIcon];
+            NSLog(@"🖼️ Set icon image, size: %.0fx%.0f", [appIcon size].width, [appIcon size].height);
+            
             // Update label text
             NSString *labelWindowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Unknown Window";
             NSString *labelAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown App";
@@ -529,10 +568,19 @@ void updateOverlay() {
                 );
                 [g_selectButton setFrameOrigin:buttonCenter];
                 
-                // Position info label above button
+                // Position app icon above text label
+                NSPoint iconCenter = NSMakePoint(
+                    (width - 96) / 2,  // Center horizontally (icon is 96px wide)
+                    buttonCenter.y + buttonSize.height + 60 + 10  // Above label + text height + margin
+                );
+                [appIconView setFrameOrigin:iconCenter];
+                NSLog(@"🎯 Positioning app icon at: (%.0f, %.0f) for window size: (%.0f, %.0f)", 
+                      iconCenter.x, iconCenter.y, (float)width, (float)height);
+                
+                // Position info label at overlay center, above button
                 NSPoint labelCenter = NSMakePoint(
-                    20,
-                    buttonCenter.y + buttonSize.height + 10  // 10px above button
+                    (width - [infoLabel frame].size.width) / 2,  // Center horizontally
+                    buttonCenter.y + buttonSize.height + 10  // 10px above button, below icon
                 );
                 [infoLabel setFrameOrigin:labelCenter];
                 
@@ -781,9 +829,9 @@ bool startScreenSelection() {
             [selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
             [selectButton setTag:i]; // Set screen index as tag
             
-            // Modern button styling with gradient-like effect
+            // Modern button styling with purple gradient-like effect
             [selectButton setWantsLayer:YES];
-            [selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.1 green:0.5 blue:0.9 alpha:0.95] CGColor]];
+            [selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.5 green:0.3 blue:0.8 alpha:0.95] CGColor]];
             [selectButton.layer setCornerRadius:14.0];
             [selectButton.layer setBorderWidth:0.0];
             
@@ -796,17 +844,17 @@ bool startScreenSelection() {
                                 range:NSMakeRange(0, [titleString length])];
             [selectButton setAttributedTitle:titleString];
             
-            // Enhanced shadow for modern look
-            [selectButton.layer setShadowColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:0.8] CGColor]];
+            // Enhanced shadow for modern look - purple tone
+            [selectButton.layer setShadowColor:[[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.8] CGColor]];
             [selectButton.layer setShadowOffset:NSMakeSize(0, -3)];
             [selectButton.layer setShadowRadius:8.0];
             [selectButton.layer setShadowOpacity:0.4];
             
-            // Add subtle inner highlight
+            // Add subtle inner highlight - purple tone
             CALayer *highlightLayer = [CALayer layer];
             [highlightLayer setFrame:CGRectMake(0, selectButton.frame.size.height * 0.6, 
                                                 selectButton.frame.size.width, selectButton.frame.size.height * 0.4)];
-            [highlightLayer setBackgroundColor:[[NSColor colorWithRed:0.3 green:0.7 blue:1.0 alpha:0.3] CGColor]];
+            [highlightLayer setBackgroundColor:[[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.3] CGColor]];
             [highlightLayer setCornerRadius:14.0];
             [selectButton.layer addSublayer:highlightLayer];
             
@@ -857,13 +905,18 @@ bool startScreenSelection() {
             [screenInfoLabel setAlignment:NSTextAlignmentCenter];
             [screenInfoLabel setFont:[NSFont systemFontOfSize:20 weight:NSFontWeightMedium]];
             [screenInfoLabel setTextColor:[NSColor whiteColor]];
-            [screenInfoLabel setWantsLayer:YES];
             
-            // Add shadow for better visibility
-            [screenInfoLabel.layer setShadowColor:[[NSColor blackColor] CGColor]];
-            [screenInfoLabel.layer setShadowOffset:NSMakeSize(0, -2)];
-            [screenInfoLabel.layer setShadowRadius:4.0];
-            [screenInfoLabel.layer setShadowOpacity:0.8];
+            // Create screen icon (display icon)
+            NSImageView *screenIconView = [[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 96, 96)];
+            [screenIconView setImageScaling:NSImageScaleProportionallyUpOrDown];
+            [screenIconView setWantsLayer:YES];
+            [screenIconView.layer setCornerRadius:16.0];
+            [screenIconView.layer setMasksToBounds:YES];
+            
+            // Set display icon
+            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+            NSImage *displayIcon = [workspace iconForFileType:NSFileTypeForHFSTypeCode(kComputerIcon)];
+            [screenIconView setImage:displayIcon];
             
             // Set screen info text
             NSString *screenName = [screenInfo objectForKey:@"name"] ?: @"Unknown Screen";
@@ -877,10 +930,17 @@ bool startScreenSelection() {
             );
             [selectButton setFrameOrigin:buttonCenter];
             
-            // Position info label above button
+            // Position screen icon above text label
+            NSPoint iconCenter = NSMakePoint(
+                (screenFrame.size.width - 96) / 2,  // Center horizontally (icon is 96px wide)
+                buttonCenter.y + [selectButton frame].size.height + 60 + 10  // Above label + text height + margin
+            );
+            [screenIconView setFrameOrigin:iconCenter];
+            
+            // Position info label at screen center, above button
             NSPoint labelCenter = NSMakePoint(
-                20,
-                buttonCenter.y + [selectButton frame].size.height + 10  // 10px above button
+                (screenFrame.size.width - [screenInfoLabel frame].size.width) / 2,  // Center horizontally
+                buttonCenter.y + [selectButton frame].size.height + 10  // 10px above button, below icon
             );
             [screenInfoLabel setFrameOrigin:labelCenter];
             
@@ -890,6 +950,7 @@ bool startScreenSelection() {
             );
             [screenCancelButton setFrameOrigin:cancelButtonCenter];
             
+            [overlayView addSubview:screenIconView];
             [overlayView addSubview:screenInfoLabel];
             [overlayView addSubview:selectButton];
             [overlayView addSubview:screenCancelButton];
@@ -1053,9 +1114,9 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_selectButton setBezelStyle:NSBezelStyleRegularSquare];
         [g_selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
         
-        // Modern button styling with gradient-like effect
+        // Modern button styling with purple gradient-like effect
         [g_selectButton setWantsLayer:YES];
-        [g_selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.1 green:0.5 blue:0.9 alpha:0.95] CGColor]];
+        [g_selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.5 green:0.3 blue:0.8 alpha:0.95] CGColor]];
         [g_selectButton.layer setCornerRadius:14.0];
         [g_selectButton.layer setBorderWidth:0.0];
         
@@ -1068,8 +1129,8 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
                             range:NSMakeRange(0, [titleString length])];
         [g_selectButton setAttributedTitle:titleString];
         
-        // Enhanced shadow for modern look
-        [g_selectButton.layer setShadowColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:0.8] CGColor]];
+        // Enhanced shadow for modern look - purple tone
+        [g_selectButton.layer setShadowColor:[[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.8] CGColor]];
         [g_selectButton.layer setShadowOffset:NSMakeSize(0, -3)];
         [g_selectButton.layer setShadowRadius:8.0];
         [g_selectButton.layer setShadowOpacity:0.4];