on xenial help sign in
Address review comments
commit449381c57433ee924784f5c27bc0f6a61caab2f8 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 22 Oct 2015, 15:54 (11 years ago) parentb71b294
2 files changed+2−13
qml/Stages/WindowResizeArea.qml+2−12 tests/qmltests/Stages/tst_WindowResizeArea.qml−1
qml/Stages/WindowResizeArea.qml+2−12
@@ -44,18 +44,8 @@ MouseArea {
4444
4545 target.x = windowState.x;
4646 target.y = windowState.y;
47−
48− if (windowState.width >= minWidth) {
49− target.requestedWidth = windowState.width;
50− } else {
51− target.requestedWidth = minWidth;
52− }
53−
54− if (windowState.height >= minHeight) {
55− target.requestedHeight = windowState.height;
56− } else {
57− target.requestedHeight = minHeight;
58− }
47+ target.requestedWidth = Math.max(windowState.width, minWidth);
48+ target.requestedHeight = Math.max(windowState.height, minHeight);
5949 }
6050
6151 Component.onDestruction: {
tests/qmltests/Stages/tst_WindowResizeArea.qml−1
@@ -198,7 +198,6 @@ Item {
198198 }
199199
200200 function test_resizeSmallerAndLarger(data) {
201− console.log("windowLoader="+windowLoader + ", windowLoader.item="+windowLoader.item + ", windowLoader.active="+windowLoader.active);
202201 var initialWindowX = fakeWindow.x;
203202 var initialWindowY = fakeWindow.y;
204203 var initialWindowWidth = fakeWindow.width