🍎 Fix full screen when resizable is set to true

This commit is contained in:
Shubham 2017-06-20 16:11:28 -04:00
parent 3abeb6e2bc
commit 1b8963ff6e
2 changed files with 24 additions and 0 deletions

View file

@ -171,6 +171,7 @@ bool ScopedDisableResize::disable_resize_ = false;
@private @private
atom::NativeWindowMac* shell_; atom::NativeWindowMac* shell_;
bool is_zooming_; bool is_zooming_;
bool is_resizable_;
} }
- (id)initWithShell:(atom::NativeWindowMac*)shell; - (id)initWithShell:(atom::NativeWindowMac*)shell;
@end @end
@ -324,6 +325,9 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (void)windowWillEnterFullScreen:(NSNotification*)notification { - (void)windowWillEnterFullScreen:(NSNotification*)notification {
// Setting resizable to true before entering fullscreen
is_resizable_ = shell_->IsResizable();
shell_->SetResizable(true);
// Hide the native toolbar before entering fullscreen, so there is no visual // Hide the native toolbar before entering fullscreen, so there is no visual
// artifacts. // artifacts.
if (base::mac::IsAtLeastOS10_10() && if (base::mac::IsAtLeastOS10_10() &&
@ -380,6 +384,7 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (void)windowDidExitFullScreen:(NSNotification*)notification { - (void)windowDidExitFullScreen:(NSNotification*)notification {
shell_->SetResizable(is_resizable_);
shell_->NotifyWindowLeaveFullScreen(); shell_->NotifyWindowLeaveFullScreen();
} }

View file

@ -2000,6 +2000,25 @@ describe('BrowserWindow module', function () {
}) })
}) })
describe('fullscreen state with resizable set', function () {
// Only implemented on macOS.
if (process.platform !== 'darwin') return
it('resizable flag should be set to true and restored', function (done) {
w.destroy()
w = new BrowserWindow({ resizable: false })
w.once('enter-full-screen', () => {
assert.equal(w.isResizable(), true)
w.setFullScreen(false)
})
w.once('leave-full-screen', () => {
assert.equal(w.isResizable(), false)
done()
})
w.setFullScreen(true)
})
})
describe('fullscreen state', function () { describe('fullscreen state', function () {
// Only implemented on macOS. // Only implemented on macOS.
if (process.platform !== 'darwin') return if (process.platform !== 'darwin') return