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

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
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window_mac.mm
View file

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