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

Fix unmaximize() not working

Browse source
This commit is contained in:
Cheng Zhao 2016-07-09 23:16:57 +09:00
parent 5979c1464f
commit f77b9db069
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_views.cc
View file

@ -421,7 +421,7 @@ void NativeWindowViews::Maximize() {
#if defined(OS_WIN) #if defined(OS_WIN)
// For window without WS_THICKFRAME style, we can not call Maximize(). // For window without WS_THICKFRAME style, we can not call Maximize().
if (!thick_frame_) { if (!thick_frame_) {
last_normal_bounds_ = GetBounds(); restore_bounds_ = GetBounds();
auto display = auto display =
gfx::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition()); gfx::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition());
SetBounds(display.work_area(), false); SetBounds(display.work_area(), false);
@ -439,7 +439,7 @@ void NativeWindowViews::Maximize() {
void NativeWindowViews::Unmaximize() { void NativeWindowViews::Unmaximize() {
#if defined(OS_WIN) #if defined(OS_WIN)
if (!thick_frame_) { if (!thick_frame_) {
SetBounds(last_normal_bounds_, false); SetBounds(restore_bounds_, false);
return; return;
} }
#endif #endif
@ -484,12 +484,12 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
// For window without WS_THICKFRAME style, we can not call SetFullscreen(). // For window without WS_THICKFRAME style, we can not call SetFullscreen().
if (!thick_frame_) { if (!thick_frame_) {
if (fullscreen) { if (fullscreen) {
last_normal_bounds_ = GetBounds(); restore_bounds_ = GetBounds();
auto display = auto display =
gfx::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition()); gfx::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition());
SetBounds(display.bounds(), false); SetBounds(display.bounds(), false);
} else { } else {
SetBounds(last_normal_bounds_, false); SetBounds(restore_bounds_, false);
} }
return; return;
} }

3
atom/browser/native_window_views.h
View file

@ -223,6 +223,9 @@ class NativeWindowViews : public NativeWindow,
// Whether to show the WS_THICKFRAME style. // Whether to show the WS_THICKFRAME style.
bool thick_frame_; bool thick_frame_;
// The bounds of window before maximize/fullscreen.
gfx::Rect restore_bounds_;
// The icons of window and taskbar. // The icons of window and taskbar.
base::win::ScopedHICON window_icon_; base::win::ScopedHICON window_icon_;
base::win::ScopedHICON app_icon_; base::win::ScopedHICON app_icon_;