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

Backport of #14648 (#15032)

Browse source
This commit is contained in:
trop[bot] 2018-10-09 09:47:29 -04:00 committed by John Kleinschmidt
parent 6c085cda74
commit 8f743e6fbe
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_views.cc
View file

@ -585,6 +585,7 @@ void NativeWindowViews::SetResizable(bool resizable) {
// both the minimum and maximum size to the window size to achieve it. // both the minimum and maximum size to the window size to achieve it.
if (resizable) { if (resizable) {
SetContentSizeConstraints(old_size_constraints_); SetContentSizeConstraints(old_size_constraints_);
SetMaximizable(maximizable_);
} else { } else {
old_size_constraints_ = GetContentSizeConstraints(); old_size_constraints_ = GetContentSizeConstraints();
resizable_ = false; resizable_ = false;

8
spec/api-browser-window-spec.js
View file

@ -2394,9 +2394,15 @@ describe('BrowserWindow module', () => {
// Only implemented on windows. // Only implemented on windows.
if (process.platform !== 'win32') return if (process.platform !== 'win32') return
it('is set to false when resizable state is set to false', () => { it('is reset to its former state', () => {
w.setMaximizable(false)
w.setResizable(false) w.setResizable(false)
w.setResizable(true)
assert.equal(w.isMaximizable(), false) assert.equal(w.isMaximizable(), false)
w.setMaximizable(true)
w.setResizable(false)
w.setResizable(true)
assert.strictEqual(w.isMaximizable(), true)
}) })
}) })