node-mac-recorder 2.5.0 → 2.5.2

package/package.json

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

package/src/window_selector.mm

@@ -57,10 +57,7 @@ bool hideScreenRecordingPreview();
     self = [super initWithFrame:frameRect];
     if (self) {
         self.wantsLayer = YES;
-        self.layer.backgroundColor = [[NSColor colorWithRed:0.0 green:0.5 blue:1.0 alpha:0.45] CGColor];
-        self.layer.borderColor = [[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] CGColor];
-        self.layer.borderWidth = 5.0;
-        self.layer.cornerRadius = 8.0;
+        self.layer.backgroundColor = [[NSColor clearColor] CGColor];
     }
     return self;
 }
@@ -70,34 +67,17 @@ bool hideScreenRecordingPreview();
     
     if (!self.windowInfo) return;
     
-    // Background with transparency
-    [[NSColor colorWithRed:0.0 green:0.5 blue:1.0 alpha:0.45] setFill];
-    NSRectFill(dirtyRect);
+    // Background with transparency - purple tone
+    [[NSColor colorWithRed:0.4 green:0.3 blue:0.8 alpha:0.08] setFill];
+    NSRectFill(self.bounds);
     
-    // Border
-    [[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] setStroke];
-    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:self.bounds xRadius:8 yRadius:8];
-    [border setLineWidth:3.0];
+    // Thin border with darker purple
+    [[NSColor colorWithRed:0.3 green:0.2 blue:0.6 alpha:0.6] setStroke];
+    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 0.5, 0.5) xRadius:12 yRadius:12];
+    [border setLineWidth:1.0];
     [border stroke];
     
-    // Window info text
-    NSString *windowTitle = [self.windowInfo objectForKey:@"title"] ?: @"Unknown Window";
-    NSString *appName = [self.windowInfo objectForKey:@"appName"] ?: @"Unknown App";
-    NSString *infoText = [NSString stringWithFormat:@"%@\n%@", appName, windowTitle];
-    
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    [style setAlignment:NSTextAlignmentCenter];
-    
-    NSDictionary *attributes = @{
-        NSFontAttributeName: [NSFont systemFontOfSize:21 weight:NSFontWeightMedium],
-        NSForegroundColorAttributeName: [NSColor whiteColor],
-        NSParagraphStyleAttributeName: style,
-        NSStrokeColorAttributeName: [NSColor blackColor],
-        NSStrokeWidthAttributeName: @(-2.0)
-    };
-    
-    NSRect textRect = NSMakeRect(10, self.bounds.size.height - 90, self.bounds.size.width - 20, 80);
-    [infoText drawInRect:textRect withAttributes:attributes];
+    // Text will be handled by separate label above button
 }
 
 @end
@@ -165,10 +145,7 @@ bool hideScreenRecordingPreview();
     self = [super initWithFrame:frameRect];
     if (self) {
         self.wantsLayer = YES;
-        self.layer.backgroundColor = [[NSColor colorWithRed:0.0 green:0.5 blue:1.0 alpha:0.45] CGColor];
-        self.layer.borderColor = [[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] CGColor];
-        self.layer.borderWidth = 5.0;
-        self.layer.cornerRadius = 8.0;
+        self.layer.backgroundColor = [[NSColor clearColor] CGColor];
     }
     return self;
 }
@@ -178,34 +155,17 @@ bool hideScreenRecordingPreview();
     
     if (!self.screenInfo) return;
     
-    // Background with transparency
-    [[NSColor colorWithRed:0.0 green:0.5 blue:1.0 alpha:0.45] setFill];
-    NSRectFill(dirtyRect);
+    // Background with transparency - purple tone
+    [[NSColor colorWithRed:0.4 green:0.3 blue:0.8 alpha:0.12] setFill];
+    NSRectFill(self.bounds);
     
-    // Border
-    [[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] setStroke];
-    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:self.bounds xRadius:8 yRadius:8];
-    [border setLineWidth:3.0];
+    // Thin border with darker purple  
+    [[NSColor colorWithRed:0.3 green:0.2 blue:0.6 alpha:0.5] setStroke];
+    NSBezierPath *border = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds, 0.5, 0.5) xRadius:15 yRadius:15];
+    [border setLineWidth:1.0];
     [border stroke];
     
-    // Screen info text
-    NSString *screenName = [self.screenInfo objectForKey:@"name"] ?: @"Unknown Screen";
-    NSString *resolution = [self.screenInfo objectForKey:@"resolution"] ?: @"Unknown Resolution";
-    NSString *infoText = [NSString stringWithFormat:@"%@\n%@", screenName, resolution];
-    
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    [style setAlignment:NSTextAlignmentCenter];
-    
-    NSDictionary *attributes = @{
-        NSFontAttributeName: [NSFont systemFontOfSize:21 weight:NSFontWeightMedium],
-        NSForegroundColorAttributeName: [NSColor whiteColor],
-        NSParagraphStyleAttributeName: style,
-        NSStrokeColorAttributeName: [NSColor blackColor],
-        NSStrokeWidthAttributeName: @(-2.0)
-    };
-    
-    NSRect textRect = NSMakeRect(10, self.bounds.size.height - 90, self.bounds.size.width - 20, 80);
-    [infoText drawInRect:textRect withAttributes:attributes];
+    // Text will be handled by separate label above button
 }
 
 @end
@@ -526,15 +486,94 @@ void updateOverlay() {
             [(WindowSelectorOverlayView *)g_overlayView setWindowInfo:windowUnderCursor];
             [g_overlayView setNeedsDisplay:YES];
             
+            // Add/update info label above button
+            NSTextField *infoLabel = nil;
+            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
+                if ([subview isKindOfClass:[NSTextField class]]) {
+                    infoLabel = (NSTextField*)subview;
+                    break;
+                }
+            }
+            
+            if (!infoLabel) {
+                infoLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, width - 40, 60)];
+                [infoLabel setEditable:NO];
+                [infoLabel setSelectable:NO];
+                [infoLabel setBezeled:NO];
+                [infoLabel setDrawsBackground:NO];
+                [infoLabel setAlignment:NSTextAlignmentCenter];
+                [infoLabel setFont:[NSFont systemFontOfSize:18 weight:NSFontWeightMedium]];
+                [infoLabel setTextColor:[NSColor whiteColor]];
+                
+                [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];  // Rounded corners like iOS
+                [appIconView.layer setMasksToBounds:YES];
+                [g_overlayWindow.contentView addSubview:appIconView];
+            }
+            
+            // 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)];
+            }
+            
+            [appIconView setImage:appIcon];
+            
+            // Update label text
+            NSString *labelWindowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Unknown Window";
+            NSString *labelAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown App";
+            [infoLabel setStringValue:[NSString stringWithFormat:@"%@\n%@", labelAppName, labelWindowTitle]];
+            
             // Position buttons - Start Record in center, Cancel below it
             if (g_selectButton) {
                 NSSize buttonSize = [g_selectButton frame].size;
                 NSPoint buttonCenter = NSMakePoint(
                     (width - buttonSize.width) / 2,
-                    (height - buttonSize.height) / 2 + 30  // Slightly above center
+                    (height - buttonSize.height) / 2 + 15  // Slightly above center
                 );
                 [g_selectButton setFrameOrigin:buttonCenter];
                 
+                // 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];
+                
+                // Position info label at overlay center, above button
+                NSPoint labelCenter = NSMakePoint(
+                    (width - [infoLabel frame].size.width) / 2,  // Center horizontally
+                    buttonCenter.y + buttonSize.height + 10  // 10px above button, below icon
+                );
+                [infoLabel setFrameOrigin:labelCenter];
+                
                 // Position cancel button below the main button
                 NSButton *cancelButton = nil;
                 for (NSView *subview in [g_overlayWindow.contentView subviews]) {
@@ -780,13 +819,14 @@ bool startScreenSelection() {
             [selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
             [selectButton setTag:i]; // Set screen index as tag
             
-            // Blue background with white text
+            // Modern button styling with gradient-like effect
             [selectButton setWantsLayer:YES];
-            [selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.95] CGColor]];
-            [selectButton.layer setCornerRadius:12.0];
+            [selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.1 green:0.5 blue:0.9 alpha:0.95] CGColor]];
+            [selectButton.layer setCornerRadius:14.0];
             [selectButton.layer setBorderWidth:0.0];
             
-            // White text color
+            // White text color with better font weight
+            [selectButton setFont:[NSFont systemFontOfSize:17 weight:NSFontWeightSemibold]];
             NSMutableAttributedString *titleString = [[NSMutableAttributedString alloc] 
                 initWithString:[selectButton title]];
             [titleString addAttribute:NSForegroundColorAttributeName 
@@ -794,11 +834,19 @@ bool startScreenSelection() {
                                 range:NSMakeRange(0, [titleString length])];
             [selectButton setAttributedTitle:titleString];
             
-            // Add shadow for better visibility
-            [selectButton.layer setShadowColor:[[NSColor blackColor] CGColor]];
-            [selectButton.layer setShadowOffset:NSMakeSize(0, -2)];
-            [selectButton.layer setShadowRadius:4.0];
-            [selectButton.layer setShadowOpacity:0.3];
+            // Enhanced shadow for modern look
+            [selectButton.layer setShadowColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:0.8] CGColor]];
+            [selectButton.layer setShadowOffset:NSMakeSize(0, -3)];
+            [selectButton.layer setShadowRadius:8.0];
+            [selectButton.layer setShadowOpacity:0.4];
+            
+            // Add subtle inner highlight
+            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 setCornerRadius:14.0];
+            [selectButton.layer addSublayer:highlightLayer];
             
             // Set button target and action (reuse global delegate)
             if (!g_delegate) {
@@ -814,13 +862,14 @@ bool startScreenSelection() {
             [screenCancelButton setBezelStyle:NSBezelStyleRegularSquare];
             [screenCancelButton setFont:[NSFont systemFontOfSize:14 weight:NSFontWeightMedium]];
             
-            // Gray cancel button styling
+            // Modern cancel button styling
             [screenCancelButton setWantsLayer:YES];
-            [screenCancelButton.layer setBackgroundColor:[[NSColor colorWithRed:0.3 green:0.3 blue:0.3 alpha:0.9] CGColor]];
-            [screenCancelButton.layer setCornerRadius:10.0];
+            [screenCancelButton.layer setBackgroundColor:[[NSColor colorWithRed:0.4 green:0.4 blue:0.4 alpha:0.9] CGColor]];
+            [screenCancelButton.layer setCornerRadius:12.0];
             [screenCancelButton.layer setBorderWidth:0.0];
             
-            // White text for cancel button
+            // White text for cancel button with better font
+            [screenCancelButton setFont:[NSFont systemFontOfSize:15 weight:NSFontWeightMedium]];
             NSMutableAttributedString *screenCancelTitleString = [[NSMutableAttributedString alloc] 
                 initWithString:[screenCancelButton title]];
             [screenCancelTitleString addAttribute:NSForegroundColorAttributeName 
@@ -828,28 +877,71 @@ bool startScreenSelection() {
                                 range:NSMakeRange(0, [screenCancelTitleString length])];
             [screenCancelButton setAttributedTitle:screenCancelTitleString];
             
-            // Add shadow for cancel button
-            [screenCancelButton.layer setShadowColor:[[NSColor blackColor] CGColor]];
-            [screenCancelButton.layer setShadowOffset:NSMakeSize(0, -1)];
-            [screenCancelButton.layer setShadowRadius:2.0];
-            [screenCancelButton.layer setShadowOpacity:0.2];
+            // Enhanced shadow for cancel button
+            [screenCancelButton.layer setShadowColor:[[NSColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.8] CGColor]];
+            [screenCancelButton.layer setShadowOffset:NSMakeSize(0, -2)];
+            [screenCancelButton.layer setShadowRadius:4.0];
+            [screenCancelButton.layer setShadowOpacity:0.3];
             
             [screenCancelButton setTarget:g_delegate];
             [screenCancelButton setAction:@selector(cancelButtonClicked:)];
             
+            // Create info label for screen
+            NSTextField *screenInfoLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, screenFrame.size.width - 40, 60)];
+            [screenInfoLabel setEditable:NO];
+            [screenInfoLabel setSelectable:NO];
+            [screenInfoLabel setBezeled:NO];
+            [screenInfoLabel setDrawsBackground:NO];
+            [screenInfoLabel setAlignment:NSTextAlignmentCenter];
+            [screenInfoLabel setFont:[NSFont systemFontOfSize:20 weight:NSFontWeightMedium]];
+            [screenInfoLabel setTextColor:[NSColor whiteColor]];
+            
+            // 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";
+            NSString *resolution = [screenInfo objectForKey:@"resolution"] ?: @"Unknown Resolution";
+            [screenInfoLabel setStringValue:[NSString stringWithFormat:@"%@\n%@", screenName, resolution]];
+            
             // Position buttons - Start Record in center, Cancel below it
             NSPoint buttonCenter = NSMakePoint(
                 (screenFrame.size.width - [selectButton frame].size.width) / 2,
-                (screenFrame.size.height - [selectButton frame].size.height) / 2 + 30  // Slightly above center
+                (screenFrame.size.height - [selectButton frame].size.height) / 2 + 15  // Slightly above center
             );
             [selectButton setFrameOrigin:buttonCenter];
             
+            // 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(
+                (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];
+            
             NSPoint cancelButtonCenter = NSMakePoint(
                 (screenFrame.size.width - [screenCancelButton frame].size.width) / 2,
                 buttonCenter.y - [selectButton frame].size.height - 20  // 20px below main button
             );
             [screenCancelButton setFrameOrigin:cancelButtonCenter];
             
+            [overlayView addSubview:screenIconView];
+            [overlayView addSubview:screenInfoLabel];
             [overlayView addSubview:selectButton];
             [overlayView addSubview:screenCancelButton];
             [overlayWindow orderFront:nil];
@@ -1012,13 +1104,14 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_selectButton setBezelStyle:NSBezelStyleRegularSquare];
         [g_selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
         
-        // Blue background with white text
+        // Modern button styling with gradient-like effect
         [g_selectButton setWantsLayer:YES];
-        [g_selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.95] CGColor]];
-        [g_selectButton.layer setCornerRadius:12.0];
+        [g_selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.1 green:0.5 blue:0.9 alpha:0.95] CGColor]];
+        [g_selectButton.layer setCornerRadius:14.0];
         [g_selectButton.layer setBorderWidth:0.0];
         
-        // White text color
+        // White text color with better font weight
+        [g_selectButton setFont:[NSFont systemFontOfSize:17 weight:NSFontWeightSemibold]];
         NSMutableAttributedString *titleString = [[NSMutableAttributedString alloc] 
             initWithString:[g_selectButton title]];
         [titleString addAttribute:NSForegroundColorAttributeName 
@@ -1026,11 +1119,11 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
                             range:NSMakeRange(0, [titleString length])];
         [g_selectButton setAttributedTitle:titleString];
         
-        // Add shadow for better visibility
-        [g_selectButton.layer setShadowColor:[[NSColor blackColor] CGColor]];
-        [g_selectButton.layer setShadowOffset:NSMakeSize(0, -2)];
-        [g_selectButton.layer setShadowRadius:4.0];
-        [g_selectButton.layer setShadowOpacity:0.3];
+        // Enhanced shadow for modern look
+        [g_selectButton.layer setShadowColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:0.8] CGColor]];
+        [g_selectButton.layer setShadowOffset:NSMakeSize(0, -3)];
+        [g_selectButton.layer setShadowRadius:8.0];
+        [g_selectButton.layer setShadowOpacity:0.4];
         
         // Create delegate for button action and timer
         g_delegate = [[WindowSelectorDelegate alloc] init];
@@ -1047,13 +1140,14 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [cancelButton setBezelStyle:NSBezelStyleRegularSquare];
         [cancelButton setFont:[NSFont systemFontOfSize:14 weight:NSFontWeightMedium]];
         
-        // Gray cancel button styling
+        // Modern cancel button styling
         [cancelButton setWantsLayer:YES];
-        [cancelButton.layer setBackgroundColor:[[NSColor colorWithRed:0.3 green:0.3 blue:0.3 alpha:0.9] CGColor]];
-        [cancelButton.layer setCornerRadius:10.0];
+        [cancelButton.layer setBackgroundColor:[[NSColor colorWithRed:0.4 green:0.4 blue:0.4 alpha:0.9] CGColor]];
+        [cancelButton.layer setCornerRadius:12.0];
         [cancelButton.layer setBorderWidth:0.0];
         
-        // White text for cancel button
+        // White text for cancel button with better font
+        [cancelButton setFont:[NSFont systemFontOfSize:15 weight:NSFontWeightMedium]];
         NSMutableAttributedString *cancelTitleString = [[NSMutableAttributedString alloc] 
             initWithString:[cancelButton title]];
         [cancelTitleString addAttribute:NSForegroundColorAttributeName 
@@ -1061,11 +1155,11 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
                             range:NSMakeRange(0, [cancelTitleString length])];
         [cancelButton setAttributedTitle:cancelTitleString];
         
-        // Add shadow for cancel button
-        [cancelButton.layer setShadowColor:[[NSColor blackColor] CGColor]];
-        [cancelButton.layer setShadowOffset:NSMakeSize(0, -1)];
-        [cancelButton.layer setShadowRadius:2.0];
-        [cancelButton.layer setShadowOpacity:0.2];
+        // Enhanced shadow for cancel button
+        [cancelButton.layer setShadowColor:[[NSColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.8] CGColor]];
+        [cancelButton.layer setShadowOffset:NSMakeSize(0, -2)];
+        [cancelButton.layer setShadowRadius:4.0];
+        [cancelButton.layer setShadowOpacity:0.3];
         
         [cancelButton setTarget:g_delegate];
         [cancelButton setAction:@selector(cancelButtonClicked:)];