summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 609d7b417..04fd53240 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1795,12 +1795,13 @@ static void cocoaKeyboardHandler(NSEvent *theEvent)
fl_lock_function();
cocoaKeyboardHandler(theEvent);
in_key_event = YES;
- if (! [[self performSelector:inputContextSEL] handleEvent:theEvent] ) {
- [self doCommandBySelector:@selector(noop:)];
- }
+ NSUInteger mods = [theEvent modifierFlags];
+ BOOL handled = YES;
+ if ( (mods & NSAlternateKeyMask) && (mods & NSCommandKeyMask) ) [self doCommandBySelector:@selector(noop:)];
+ else handled = [[self performSelector:inputContextSEL] handleEvent:theEvent];
in_key_event = NO;
fl_unlock_function();
- return YES;
+ return handled;
}
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent
{