github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 00:09:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: persist maximizable state when toggling fullscreen (#22988)

Browse Source
This commit is contained in:
Shelley Vohr
2020-04-07 20:40:32 -07:00
committed by GitHub
parent b4447be037
commit a7469f82ac
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/browser/ui/cocoa/electron_ns_window.mm
View File

@@ -207,11 +207,17 @@ bool ScopedDisableResize::disable_resize_ = false;
// If we're in simple fullscreen mode and trying to exit it
// we need to ensure we exit it properly to prevent a crash
// with NSWindowStyleMaskTitled mode
if (is_simple_fs || always_simple_fs)
// with NSWindowStyleMaskTitled mode.
if (is_simple_fs || always_simple_fs) {
shell_->SetSimpleFullScreen(!is_simple_fs);
else
} else {
bool maximizable = shell_->IsMaximizable();
[super toggleFullScreen:sender];
// Exiting fullscreen causes Cocoa to redraw the NSWindow, which resets
// the enabled state for NSWindowZoomButton. We need to persist it.
shell_->SetMaximizable(maximizable);
}
}
- (void)performMiniaturize:(id)sender {