Give menu a chance to handle key event before window
authorKevin Sawicki <kevinsawicki@gmail.com>
Wed, 6 Jul 2016 17:10:01 +0000 (10:10 -0700)
committerKevin Sawicki <kevinsawicki@gmail.com>
Wed, 6 Jul 2016 17:12:40 +0000 (10:12 -0700)
atom/browser/common_web_contents_delegate_mac.mm

index aa675408305ade201ccbf266cd0b450f31f44db9..34df15bb0c2c5789debcc4083affe16b36bc754e 100644 (file)
@@ -27,6 +27,11 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
   if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen())
     ExitFullscreenModeForTab(source);
 
+  // Send the event to the menu before sending it to the window
+  if (event.os_event.type == NSKeyDown &&
+      [[NSApp mainMenu] performKeyEquivalent:event.os_event])
+    return;
+
   if (event.os_event.window)
     [event.os_event.window redispatchKeyEvent:event.os_event];
 }