Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 07:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
BUGZ-592: Lilypad Launcher (Mac): Upon Login Standard/Common Shortcuts Not Enabled
This commit is contained in:
Brad Hefta-Gaub 2019-06-11 16:40:25 -07:00 committed by GitHub
commit 0ff470107c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launchers/darwin/nib/Window.xib
View file

@ -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"/>

49
launchers/darwin/src/CustomUI.m
View file

@ -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

1
launchers/darwin/src/main.mm
View file

@ -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);
}