Merge pull request #15743 from danteruiz/more-launcher-bugs

BUGZ-592: Lilypad Launcher (Mac): Upon Login Standard/Common Shortcuts Not Enabled

launchers/darwin/nib/Window.xib

@@ -11,7 +11,7 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="Window">
             <windowStyleMask key="styleMask" closable="YES"/>
             <rect key="contentRect" x="505" y="583" width="515" height="390"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="515" height="390"/>
                 <autoresizingMask key="autoresizingMask"/>

launchers/darwin/src/CustomUI.m

@@ -15,6 +15,31 @@ NSString* hifiBackgroundFilename = @"hifi_window";
                                                           forObject:self];
     fieldEditor.insertionPointColor = insertionPointColor;
 }
+
+- (BOOL) performKeyEquivalent:(NSEvent *)event
+{
+    if ([event type] == NSEventTypeKeyDown) {
+        if ([event modifierFlags] & NSEventModifierFlagCommand) {
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"v"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"paste:")) to:nil from:self];
+                return TRUE;
+            }
+            
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"c"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"copy:")) to:nil from:self];
+                return TRUE;
+            }
+            
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"a"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"selectAll:")) to:nil from:self];
+                return TRUE;
+            }
+        }
+    }
+    
+    return [super performKeyEquivalent:event];
+}
+
 - (void) mouseDown:(NSEvent *)event
 {
     NSColor *insertionPointColor = [NSColor whiteColor];
@@ -63,6 +88,30 @@ NSString* hifiBackgroundFilename = @"hifi_window";
     fieldEditor.insertionPointColor = insertionPointColor;
     return status;
 }
+
+- (BOOL) performKeyEquivalent:(NSEvent *)event
+{
+    if ([event type] == NSEventTypeKeyDown) {
+        if ([event modifierFlags] & NSEventModifierFlagCommand) {
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"v"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"paste:")) to:nil from:self];
+                return TRUE;
+            }
+            
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"c"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"copy:")) to:nil from:self];
+                return TRUE;
+            }
+            
+            if ([[event charactersIgnoringModifiers] isEqualToString:@"a"]) {
+                [NSApp sendAction:(NSSelectorFromString(@"selectAll:")) to:nil from:self];
+                return TRUE;
+            }
+        }
+    }
+    
+    return [super performKeyEquivalent:event];
+}
 @end
 
 

launchers/darwin/src/main.mm

@@ -41,5 +41,6 @@ int main(int argc, const char* argv[]) {
     [appMenu addItem:quitMenuItem];
     [appMenuItem setSubmenu:appMenu];
     
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:TRUE];
     return NSApplicationMain(argc, argv);
 }