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

Merge pull request #8399 from watilde/feature/fixes-8338

Browse source 
save a fullscreen state when Kiosk mode is called
This commit is contained in:
Kevin Sawicki 2017-01-17 13:03:51 -08:00 • committed by GitHub
commit f7bdf5d04e
3 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_mac.h
View file

@ -162,6 +162,8 @@ class NativeWindowMac : public NativeWindow,
bool is_kiosk_;
bool was_fullscreen_;
bool zoom_to_page_width_;
NSInteger attention_request_id_; // identifier from requestUserAttention

4
atom/browser/native_window_mac.mm
View file

@ -619,6 +619,7 @@ NativeWindowMac::NativeWindowMac(
NativeWindow* parent)
: NativeWindow(web_contents, options, parent),
is_kiosk_(false),
was_fullscreen_(false),
zoom_to_page_width_(false),
attention_request_id_(0),
title_bar_style_(NORMAL) {
@ -1126,10 +1127,11 @@ void NativeWindowMac::SetKiosk(bool kiosk) {
NSApplicationPresentationDisableHideApplication;
[NSApp setPresentationOptions:options];
is_kiosk_ = true;
was_fullscreen_ = IsFullscreen();
SetFullScreen(true);
} else if (!kiosk && is_kiosk_) {
is_kiosk_ = false;
SetFullScreen(false);
if (!was_fullscreen_) SetFullScreen(false);
[NSApp setPresentationOptions:kiosk_options_];
}
}