commit 6fc05d8b374638ac0aa2d11df90ebde7197e2cb1
author John Stiles <johnstiles@google.com> Mon Jul 06 13:14:21 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 06 19:02:24 2020 +0000
tree 447efbd08263e2956caf7ff459a36032bc50d498
parent 609f1597e47162b7314b7088c75670491454b849

Allow system key equivalents to work again.

The changes in http://review.skia.org/300182 caused cmd-Q to stop
working normally in Viewer, because the Mac window would report that it
had processed all key equivalents. This prevented the NSApp from
handling key equivalents in the menu bar. This CL now forwards on all
key equivalents to the system for processing (even as it passes them to
ImGui), allowing cmd-Q to work again.

This CL also simplifies the pattern for updating modifier keys slightly.

Change-Id: I2285839b41dd361e34694eccbc6d581662b24648
Bug: skia:10338
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300651
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>

tools/sk_app/mac/Window_mac.mm

diff --git a/tools/sk_app/mac/Window_mac.mm b/tools/sk_app/mac/Window_mac.mm
index 041c228..e1671f6 100644
--- a/tools/sk_app/mac/Window_mac.mm
+++ b/tools/sk_app/mac/Window_mac.mm
@@ -322,9 +322,10 @@
     [super updateTrackingAreas];
 }
 
-- (void)updateModifierKeys:(skui::ModifierKey) modifiers {
+- (skui::ModifierKey) updateModifierKeys:(NSEvent*) event {
     using sknonstd::Any;
 
+    skui::ModifierKey modifiers = get_modifiers(event);
     skui::ModifierKey changed = modifiers ^ fLastModifiers;
     fLastModifiers = modifiers;
 
@@ -344,20 +345,24 @@
             (void) fWindow->onKey(cur.key, state, modifiers);
         }
     }
+
+    return modifiers;
 }
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event {
-    // By default, key equivalents send -keyDown events without a matching -keyUp. Let's synthesize
-    // a matching -keyUp on a later frame. We only read the modifiers and key code from the event,
-    // so we can get away with reusing a "key down" event as a "key up".
-    [self keyDown:event];
+    [self updateModifierKeys:event];
+
+    // By default, unhandled key equivalents send -keyDown events; unfortunately, they do not send
+    // a matching -keyUp. In other words, we can claim that we didn't handle the event and OS X will
+    // turn this event into a -keyDown automatically, but we need to synthesize a matching -keyUp on
+    // a later frame. Since we only read the modifiers and key code from the event, we can reuse
+    // this "key-equivalent" event as a "key up".
     [self performSelector:@selector(keyUp:) withObject:event afterDelay:0.1];
-    return YES;
+    return NO;
 }
 
 - (void)keyDown:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     skui::Key key = get_key([event keyCode]);
     if (key != skui::Key::kNONE) {
@@ -381,8 +386,7 @@
 }
 
 - (void)keyUp:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     skui::Key key = get_key([event keyCode]);
     if (key != skui::Key::kNONE) {
@@ -391,13 +395,11 @@
 }
 
 -(void)flagsChanged:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    [self updateModifierKeys:event];
 }
 
 - (void)mouseDown:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     const NSPoint pos = [event locationInWindow];
     const NSRect rect = [fWindow->window().contentView frame];
@@ -405,8 +407,7 @@
 }
 
 - (void)mouseUp:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     const NSPoint pos = [event locationInWindow];
     const NSRect rect = [fWindow->window().contentView frame];
@@ -414,12 +415,12 @@
 }
 
 - (void)mouseDragged:(NSEvent *)event {
+    [self updateModifierKeys:event];
     [self mouseMoved:event];
 }
 
 - (void)mouseMoved:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     const NSPoint pos = [event locationInWindow];
     const NSRect rect = [fWindow->window().contentView frame];
@@ -427,8 +428,7 @@
 }
 
 - (void)scrollWheel:(NSEvent *)event {
-    skui::ModifierKey modifiers = get_modifiers(event);
-    [self updateModifierKeys:modifiers];
+    skui::ModifierKey modifiers = [self updateModifierKeys:event];
 
     // TODO: support hasPreciseScrollingDeltas?
     fWindow->onMouseWheel([event scrollingDeltaY], modifiers);