fix Commend+X issue on Chrome and Safari

dongyuwei · Feb 26, 2017 · 2300f73 · 2300f73
1 parent 34af2e5
commit 2300f73
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/InputController.m b/src/InputController.m
@@ -51,6 +51,11 @@ -(BOOL)handleEvent:(NSEvent*)event client:(id)sender{
             if (defaultEnglishMode){
                 break;
             }
+
+            // ignore Command+X hotkeys.
+            if (modifiers & NSCommandKeyMask)
+                break;
+
             handled = [self onKeyEvent:event client:sender];
             break;
         default:
@@ -69,11 +74,6 @@ -(BOOL)onKeyEvent:(NSEvent*)event client:(id)sender{
     _currentClient = sender;
     NSInteger keyCode = [event keyCode];
     NSString* string = [event characters];
-    NSUInteger modifiers = [event modifierFlags];
-    if ([self shouldIgnoreKey:keyCode modifiers:modifiers]){
-        [self reset];
-        return NO;
-    }
 
     if(keyCode == KEY_DELETE){
         NSString* bufferedText = [self originalBuffer];
@@ -117,10 +117,6 @@ -(BOOL)onKeyEvent:(NSEvent*)event client:(id)sender{
     return NO;
 }
 
-- (BOOL) shouldIgnoreKey:(NSInteger)keyCode modifiers:(NSUInteger)flags{
-    return (flags & NSCommandKeyMask);
-}
-
 - (BOOL)deleteBackward:(id)sender{
     NSMutableString*		originalText = [self originalBuffer];