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

mac: Restore presentation options when leaving kiosk mode, fixes #272.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-09 13:04:59 +08:00
parent 7d38fe61d2
commit 1d6b02f304
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window_mac.h
View file

@ -95,6 +95,9 @@ class NativeWindowMac : public NativeWindow {
NSInteger attention_request_id_; // identifier from requestUserAttention NSInteger attention_request_id_; // identifier from requestUserAttention
// The presentation options before entering kiosk mode.
NSApplicationPresentationOptions kiosk_options_;
// For system drag, the whole window is draggable and the non-draggable areas // For system drag, the whole window is draggable and the non-draggable areas
// have to been explicitly excluded. // have to been explicitly excluded.
std::vector<gfx::Rect> system_drag_exclude_areas_; std::vector<gfx::Rect> system_drag_exclude_areas_;

7
atom/browser/native_window_mac.mm
View file

@ -409,7 +409,8 @@ void NativeWindowMac::FlashFrame(bool flash) {
} }
void NativeWindowMac::SetKiosk(bool kiosk) { void NativeWindowMac::SetKiosk(bool kiosk) {
if (kiosk) { if (kiosk && !is_kiosk_) {
kiosk_options_ = [NSApp currentSystemPresentationOptions];
NSApplicationPresentationOptions options = NSApplicationPresentationOptions options =
NSApplicationPresentationHideDock + NSApplicationPresentationHideDock +
NSApplicationPresentationHideMenuBar + NSApplicationPresentationHideMenuBar +
@ -421,10 +422,10 @@ void NativeWindowMac::SetKiosk(bool kiosk) {
[NSApp setPresentationOptions:options]; [NSApp setPresentationOptions:options];
is_kiosk_ = true; is_kiosk_ = true;
SetFullscreen(true); SetFullscreen(true);
} else { } else if (!kiosk && is_kiosk_) {
[NSApp setPresentationOptions:[NSApp currentSystemPresentationOptions]];
is_kiosk_ = false; is_kiosk_ = false;
SetFullscreen(false); SetFullscreen(false);
[NSApp setPresentationOptions:kiosk_options_];
} }
} }