git.iko.soy/unity8
on xenial help sign in
fix tst_windowResizeArea
10da2ebLukáš Tinkl
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=21)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
tests/qmltests/Stage/tst_WindowResizeArea.qml+30−30
@@ -240,10 +240,10 @@ Item {
240 property var fakeWindow: windowLoader.item
240 property var fakeWindow: windowLoader.item
241
241
242 function init() {
242 function init() {
243− fakeWindow.requestedX = units.gu(20)
243+ fakeWindow.windowedX = units.gu(20)
244− fakeWindow.requestedY = units.gu(20)
244+ fakeWindow.windowedY = units.gu(20)
245− fakeWindow.requestedWidth = units.gu(20)
245+ fakeWindow.windowedWidth = units.gu(20)
246− fakeWindow.requestedHeight = units.gu(20)
246+ fakeWindow.windowedHeight = units.gu(20)
247 fakeWindow.resizeAreaMinWidth = units.gu(15);
247 fakeWindow.resizeAreaMinWidth = units.gu(15);
248 fakeWindow.resizeAreaMinHeight = units.gu(10);
248 fakeWindow.resizeAreaMinHeight = units.gu(10);
249 fakeWindow.minimumWidth = 0;
249 fakeWindow.minimumWidth = 0;
@@ -268,8 +268,8 @@ Item {
268 }
268 }
269
269
270 function test_resizeWindowRightBottom(data) {
270 function test_resizeWindowRightBottom(data) {
271− var initialWindowX = fakeWindow.requestedX;
271+ var initialWindowX = fakeWindow.windowedX;
272− var initialWindowY = fakeWindow.requestedY;
272+ var initialWindowY = fakeWindow.windowedY;
273 var initialWindowWidth = fakeWindow.width
273 var initialWindowWidth = fakeWindow.width
274 var initialWindowHeight = fakeWindow.height
274 var initialWindowHeight = fakeWindow.height
275
275
@@ -294,8 +294,8 @@ Item {
294 }
294 }
295
295
296 function test_resizeWindowLeftTop(data) {
296 function test_resizeWindowLeftTop(data) {
297− var initialWindowX = fakeWindow.requestedX;
297+ var initialWindowX = fakeWindow.windowedX;
298− var initialWindowY = fakeWindow.requestedY;
298+ var initialWindowY = fakeWindow.windowedY;
299 var initialWindowWidth = fakeWindow.width
299 var initialWindowWidth = fakeWindow.width
300 var initialWindowHeight = fakeWindow.height
300 var initialWindowHeight = fakeWindow.height
301
301
@@ -313,8 +313,8 @@ Item {
313 }
313 }
314
314
315 function test_saveRestoreSize() {
315 function test_saveRestoreSize() {
316− var initialWindowX = fakeWindow.requestedX;
316+ var initialWindowX = fakeWindow.windowedX;
317− var initialWindowY = fakeWindow.requestedY;
317+ var initialWindowY = fakeWindow.windowedY;
318 var initialWindowWidth = fakeWindow.width
318 var initialWindowWidth = fakeWindow.width
319 var initialWindowHeight = fakeWindow.height
319 var initialWindowHeight = fakeWindow.height
320
320
@@ -346,8 +346,8 @@ Item {
346 }
346 }
347
347
348 function test_resizeSmallerAndLarger(data) {
348 function test_resizeSmallerAndLarger(data) {
349− var initialWindowX = fakeWindow.requestedX;
349+ var initialWindowX = fakeWindow.windowedX;
350− var initialWindowY = fakeWindow.requestedY;
350+ var initialWindowY = fakeWindow.windowedY;
351 var initialWindowWidth = fakeWindow.width
351 var initialWindowWidth = fakeWindow.width
352 var initialWindowHeight = fakeWindow.height
352 var initialWindowHeight = fakeWindow.height
353
353
@@ -362,18 +362,18 @@ Item {
362 }
362 }
363
363
364 function test_saveRestoreMaximized() {
364 function test_saveRestoreMaximized() {
365− var initialWindowX = fakeWindow.requestedX;
365+ var initialWindowX = fakeWindow.windowedX;
366− var initialWindowY = fakeWindow.requestedY;
366+ var initialWindowY = fakeWindow.windowedY;
367
367
368 var moveDelta = units.gu(5);
368 var moveDelta = units.gu(5);
369
369
370− fakeWindow.requestedX = initialWindowX + moveDelta
370+ fakeWindow.windowedX = initialWindowX + moveDelta
371− fakeWindow.requestedY = initialWindowY + moveDelta
371+ fakeWindow.windowedY = initialWindowY + moveDelta
372
372
373 // Now change the state to maximized. The window should not keep updating the stored values
373 // Now change the state to maximized. The window should not keep updating the stored values
374 fakeWindow.maximize()
374 fakeWindow.maximize()
375− fakeWindow.requestedX = 31415 // 0 is too risky to pass the test even when broken
375+ fakeWindow.windowedX = 31415 // 0 is too risky to pass the test even when broken
376− fakeWindow.requestedY = 31415
376+ fakeWindow.windowedY = 31415
377
377
378 // This will destroy the window and recreate it
378 // This will destroy the window and recreate it
379 windowLoader.active = false;
379 windowLoader.active = false;
@@ -403,8 +403,8 @@ Item {
403 }
403 }
404
404
405 function test_restoreMovesIntoBounds(data) {
405 function test_restoreMovesIntoBounds(data) {
406− fakeWindow.requestedX = data.x;
406+ fakeWindow.windowedX = data.x;
407− fakeWindow.requestedY = data.y;
407+ fakeWindow.windowedY = data.y;
408 fakeWindow.width = data.w;
408 fakeWindow.width = data.w;
409 fakeWindow.height = data.h;
409 fakeWindow.height = data.h;
410 waitForRendering(root);
410 waitForRendering(root);
@@ -431,8 +431,8 @@ Item {
431 and height) increment value.
431 and height) increment value.
432 */
432 */
433 function test_sizeIncrement() {
433 function test_sizeIncrement() {
434− var initialWindowX = fakeWindow.requestedX;
434+ var initialWindowX = fakeWindow.windowedX;
435− var initialWindowY = fakeWindow.requestedY;
435+ var initialWindowY = fakeWindow.windowedY;
436 var initialWindowWidth = fakeWindow.width
436 var initialWindowWidth = fakeWindow.width
437 var initialWindowHeight = fakeWindow.height
437 var initialWindowHeight = fakeWindow.height
438
438
@@ -462,12 +462,12 @@ Item {
462 Tests that when dragging a window border you cannot make it bigger than its maximum size
462 Tests that when dragging a window border you cannot make it bigger than its maximum size
463 */
463 */
464 function test_maximumSize() {
464 function test_maximumSize() {
465− fakeWindow.requestedX = units.gu(1);
465+ fakeWindow.windowedX = units.gu(1);
466− fakeWindow.requestedY = units.gu(1);
466+ fakeWindow.windowedY = units.gu(1);
467 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
467 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
468 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
468 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
469− fakeWindow.requestedWidth = units.gu(10);
469+ fakeWindow.windowedWidth = units.gu(10);
470− fakeWindow.requestedHeight = units.gu(10);
470+ fakeWindow.windowedHeight = units.gu(10);
471
471
472 fakeWindow.maximumWidth = units.gu(20);
472 fakeWindow.maximumWidth = units.gu(20);
473 fakeWindow.maximumHeight = units.gu(20);
473 fakeWindow.maximumHeight = units.gu(20);
@@ -492,12 +492,12 @@ Item {
492 Tests that when dragging a window border you cannot make it smaller than its minimum size
492 Tests that when dragging a window border you cannot make it smaller than its minimum size
493 */
493 */
494 function test_minimumSize() {
494 function test_minimumSize() {
495− fakeWindow.requestedX = units.gu(1);
495+ fakeWindow.windowedX = units.gu(1);
496− fakeWindow.requestedY = units.gu(1);
496+ fakeWindow.windowedY = units.gu(1);
497 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
497 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
498 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
498 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
499− fakeWindow.requestedWidth = units.gu(20);
499+ fakeWindow.windowedWidth = units.gu(20);
500− fakeWindow.requestedHeight = units.gu(20);
500+ fakeWindow.windowedHeight = units.gu(20);
501
501
502 fakeWindow.minimumWidth = units.gu(10);
502 fakeWindow.minimumWidth = units.gu(10);
503 fakeWindow.minimumHeight = units.gu(10);
503 fakeWindow.minimumHeight = units.gu(10);