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

fix: on macOS show BrowserWindow on maximize if not currently shown (#32949)

Browse source
This commit is contained in:
David Sanders 2022-03-29 16:08:34 -07:00 • committed by GitHub
parent 89c1abd1b3
commit 9c3b159b95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/native_window_mac.mm
View file

@ -602,13 +602,23 @@ void NativeWindowMac::SetEnabled(bool enable) {
} }
void NativeWindowMac::Maximize() { void NativeWindowMac::Maximize() {
if (IsMaximized()) const bool is_visible = [window_ isVisible];
if (IsMaximized()) {
if (!is_visible)
ShowInactive();
return; return;
}
// Take note of the current window size // Take note of the current window size
if (IsNormal()) if (IsNormal())
original_frame_ = [window_ frame]; original_frame_ = [window_ frame];
[window_ zoom:nil]; [window_ zoom:nil];
if (!is_visible) {
ShowInactive();
NotifyWindowMaximize();
}
} }
void NativeWindowMac::Unmaximize() { void NativeWindowMac::Unmaximize() {

10
spec-main/api-browser-window-spec.ts
View file

@ -3579,22 +3579,24 @@ describe('BrowserWindow module', () => {
// TODO(dsanders11): Enable once maximize event works on Linux again on CI // TODO(dsanders11): Enable once maximize event works on Linux again on CI
ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => { ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => {
afterEach(closeAllWindows); afterEach(closeAllWindows);
// TODO(dsanders11): Disabled on macOS, see https://github.com/electron/electron/issues/32947 it('should show the window if it is not currently shown', async () => {
ifit(process.platform !== 'darwin')('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false }); const w = new BrowserWindow({ show: false });
const hidden = emittedOnce(w, 'hide'); const hidden = emittedOnce(w, 'hide');
const shown = emittedOnce(w, 'show'); let shown = emittedOnce(w, 'show');
const maximize = emittedOnce(w, 'maximize'); const maximize = emittedOnce(w, 'maximize');
expect(w.isVisible()).to.be.false('visible'); expect(w.isVisible()).to.be.false('visible');
w.maximize(); w.maximize();
await maximize; await maximize;
await shown;
expect(w.isMaximized()).to.be.true('maximized');
expect(w.isVisible()).to.be.true('visible'); expect(w.isVisible()).to.be.true('visible');
// Even if the window is already maximized // Even if the window is already maximized
w.hide(); w.hide();
await hidden; await hidden;
expect(w.isVisible()).to.be.false('visible'); expect(w.isVisible()).to.be.false('visible');
shown = emittedOnce(w, 'show');
w.maximize(); w.maximize();
await shown; // Ensure a 'show' event happens when it becomes visible await shown;
expect(w.isVisible()).to.be.true('visible'); expect(w.isVisible()).to.be.true('visible');
}); });
}); });