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

Merge pull request #6068 from electron/redispatch-events

Browse source 
Redispatch events to handle native OSX shortcuts
This commit is contained in:
Cheng Zhao 2016-06-19 11:22:02 +00:00 committed by GitHub
commit 6f4899bd94
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
atom/browser/common_web_contents_delegate_mac.mm
View file

@ -6,9 +6,14 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include "brightray/browser/mac/event_dispatching_window.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
#include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/keycodes/keyboard_codes.h"
@interface NSWindow (EventDispatchingWindow)
- (void)redispatchKeyEvent:(NSEvent*)event;
@end
namespace atom { namespace atom {
void CommonWebContentsDelegate::HandleKeyboardEvent( void CommonWebContentsDelegate::HandleKeyboardEvent(
@ -22,18 +27,8 @@ 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);
BOOL handled = [[NSApp mainMenu] performKeyEquivalent:event.os_event]; if (event.os_event.window)
if (!handled && event.os_event.window) { [event.os_event.window redispatchKeyEvent:event.os_event];
// 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];
}
}
}
} }
} // namespace atom } // namespace atom

3
atom/browser/native_window_mac.mm
View file

@ -15,6 +15,7 @@
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h" #include "brightray/browser/inspectable_web_contents_view.h"
#include "brightray/browser/mac/event_dispatching_window.h"
#include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_accessibility_state.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
@ -270,7 +271,7 @@ bool ScopedDisableResize::disable_resize_ = false;
@end @end
@interface AtomNSWindow : NSWindow { @interface AtomNSWindow : EventDispatchingWindow {
@private @private
atom::NativeWindowMac* shell_; atom::NativeWindowMac* shell_;
bool enable_larger_than_screen_; bool enable_larger_than_screen_;

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 717d92968d7959814060b9409c4720ab647bd90e Subproject commit 2f931b6a8947fb9c336d880d9ddac8987527ac81