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

Redispatch events to handle native shortcuts

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-15 13:55:19 -07:00
parent 66fe1e48e8
commit a2bbfea9e0
3 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/common_web_contents_delegate_mac.mm
View file

@ -6,6 +6,7 @@
#import <Cocoa/Cocoa.h>
#include "atom/browser/native_window_mac.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/events/keycodes/keyboard_codes.h"
@ -22,17 +23,9 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen())
ExitFullscreenModeForTab(source);
BOOL handled = [[NSApp mainMenu] performKeyEquivalent:event.os_event];
if (!handled && event.os_event.window) {
// Handle the cmd+~ shortcut.
if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ &&
(event.os_event.keyCode == 50 /* ~ */)) {
if (event.os_event.modifierFlags & NSShiftKeyMask) {
[NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil];
} else {
[NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil];
}
}
if (event.os_event.window) {
AtomNSWindow* native_window = static_cast<AtomNSWindow*>(event.os_event.window);
[native_window redispatchKeyEvent:event.os_event];
}
}