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

fix: don't unmaximize on macOS if user set max bounds (#33480)

Browse source
This commit is contained in:
Shelley Vohr 2022-03-31 00:29:02 +02:00 • committed by GitHub
parent afe0116d59
commit 8c8642634d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/native_window_mac.mm
View file

@ -622,7 +622,18 @@ void NativeWindowMac::Maximize() {
}
void NativeWindowMac::Unmaximize() {
if (!IsMaximized())
// Bail if the last user set bounds were the same size as the window
// screen (e.g. the user set the window to maximized via setBounds)
//
// Per docs during zoom:
// > If there’s no saved user state because there has been no previous
// > zoom,the size and location of the window don’t change.
//
// However, in classic Apple fashion, this is not the case in practice,
// and the frame inexplicably becomes very tiny. We should prevent
// zoom from being called if the window is being unmaximized and its
// unmaximized window bounds are themselves functionally maximized.
if (!IsMaximized() || user_set_bounds_maximized_)
return;
[window_ zoom:nil];
@ -724,6 +735,7 @@ void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
cocoa_bounds.origin.y = NSHeight([screen frame]) - size.height() - bounds.y();
[window_ setFrame:cocoa_bounds display:YES animate:animate];
user_set_bounds_maximized_ = IsMaximized() ? true : false;
}
gfx::Rect NativeWindowMac::GetBounds() {