Skip to content

Commit

Permalink
fix: don't unmaximize on macOS if user set max bounds (#33550)
Browse files Browse the repository at this point in the history
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
  • Loading branch information
trop[bot] and codebytere committed Mar 31, 2022
1 parent 6179b03 commit 3cd795a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
2 changes: 2 additions & 0 deletions shell/browser/native_window_mac.h
Expand Up @@ -267,6 +267,8 @@ class NativeWindowMac : public NativeWindow,
// Maximizable window state; necessary for persistence through redraws.
bool maximizable_ = true;

bool user_set_bounds_maximized_ = false;

// Simple (pre-Lion) Fullscreen Settings
bool always_simple_fullscreen_ = false;
bool is_simple_fullscreen_ = false;
Expand Down
14 changes: 13 additions & 1 deletion shell/browser/native_window_mac.mm
Expand Up @@ -622,7 +622,18 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
}

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];
Expand Down Expand Up @@ -724,6 +735,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
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() {
Expand Down
16 changes: 16 additions & 0 deletions spec-main/api-browser-window-spec.ts
Expand Up @@ -3633,6 +3633,22 @@ describe('BrowserWindow module', () => {
expectBoundsEqual(w.getSize(), initialSize);
expectBoundsEqual(w.getPosition(), initialPosition);
});

ifit(process.platform === 'darwin')('should not change size or position of a window which is functionally maximized', async () => {
const { workArea } = screen.getPrimaryDisplay();

const bounds = {
x: workArea.x,
y: workArea.y,
width: workArea.width,
height: workArea.height
};

const w = new BrowserWindow(bounds);
w.unmaximize();
await delay(1000);
expectBoundsEqual(w.getBounds(), bounds);
});
});

describe('setFullScreen(false)', () => {
Expand Down

0 comments on commit 3cd795a

Please sign in to comment.