From 15f7dc660992b42cde2ffd12a26a4c411476e0e7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 12 Jul 2016 10:05:32 -0700 Subject: [PATCH 1/2] Initialize to constraints to current constraints --- atom/browser/native_window.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index c084f448a3..a71b0924b2 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -209,7 +209,7 @@ gfx::Size NativeWindow::GetContentSize() { void NativeWindow::SetSizeConstraints( const extensions::SizeConstraints& window_constraints) { - extensions::SizeConstraints content_constraints; + extensions::SizeConstraints content_constraints(GetContentSizeConstraints()); if (window_constraints.HasMaximumSize()) content_constraints.set_maximum_size( WindowSizeToContentSize(window_constraints.GetMaximumSize())); From 181b8d799e2133fc76e28995a048a7153c24569a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 12 Jul 2016 10:19:34 -0700 Subject: [PATCH 2/2] Add spec for min/max window size --- spec/api-browser-window-spec.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 2bc55484db..7153e28d9e 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -287,6 +287,21 @@ describe('browser-window module', function () { }) }) + describe('BrowserWindow.setMinimum/MaximumSize(width, height)', function () { + it('sets the maximum and minimum size of the window', function () { + assert.deepEqual(w.getMinimumSize(), [0, 0]) + assert.deepEqual(w.getMaximumSize(), [0, 0]) + + w.setMinimumSize(100, 100) + assert.deepEqual(w.getMinimumSize(), [100, 100]) + assert.deepEqual(w.getMaximumSize(), [0, 0]) + + w.setMaximumSize(900, 600) + assert.deepEqual(w.getMinimumSize(), [100, 100]) + assert.deepEqual(w.getMaximumSize(), [900, 600]) + }) + }) + describe('BrowserWindow.setAspectRatio(ratio)', function () { it('resets the behaviour when passing in 0', function (done) { var size = [300, 400]