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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats 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 // If we're in simple fullscreen mode and trying to exit it
// we need to ensure we exit it properly to prevent a crash // we need to ensure we exit it properly to prevent a crash
// with NSWindowStyleMaskTitled mode // with NSWindowStyleMaskTitled mode.
if (is_simple_fs || always_simple_fs) if (is_simple_fs || always_simple_fs) {
shell_->SetSimpleFullScreen(!is_simple_fs); shell_->SetSimpleFullScreen(!is_simple_fs);
else } else {
bool maximizable = shell_->IsMaximizable();
[super toggleFullScreen:sender]; [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 { - (void)performMiniaturize:(id)sender {