mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6370 from electron/send-key-event-to-main-menu

Browse source 
Give menu a chance to handle keydown event before window
This commit is contained in:
Cheng Zhao 2016-07-07 10:11:12 +09:00 committed by GitHub
commit c7e0df09bc
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/common_web_contents_delegate_mac.mm
View file

@ -27,6 +27,11 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen()) if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen())
ExitFullscreenModeForTab(source); 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) if (event.os_event.window)
[event.os_event.window redispatchKeyEvent:event.os_event]; [event.os_event.window redispatchKeyEvent:event.os_event];
} }