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

🎨 Reuse existing function

Browse source
This commit is contained in:
dharders 2017-06-14 10:47:15 +10:00
parent aeb68c2369
commit 265ab45bd7
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/native_window_views.cc
View file

@ -480,7 +480,7 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
#if defined(OS_WIN) #if defined(OS_WIN)
// There is no native fullscreen state on Windows. // There is no native fullscreen state on Windows.
bool fullscreen_to_normal_detected = IsFullscreen() && !fullscreen; bool leaving_fullscreen = IsFullscreen() && !fullscreen;
if (fullscreen) { if (fullscreen) {
last_window_state_ = ui::SHOW_STATE_FULLSCREEN; last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
@ -512,11 +512,8 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
// else a non-responsive window shell could be rendered. // else a non-responsive window shell could be rendered.
// (this situation may arise when app starts with fullscreen: true) // (this situation may arise when app starts with fullscreen: true)
// Note: the following must be after "window_->SetFullscreen(fullscreen);" // Note: the following must be after "window_->SetFullscreen(fullscreen);"
if (fullscreen_to_normal_detected && !IsVisible()) { if (leaving_fullscreen && !IsVisible())
LONG frame_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE); FlipWindowStyle(GetAcceleratedWidget(), true, WS_VISIBLE);
frame_style |= WS_VISIBLE;
::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
}
#else #else
if (IsVisible()) if (IsVisible())
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);