on xenial help sign in
fix fullscreen, stabilize tests
commitaad693fd613a7cef1e5311cf9eb1c5242f79686e authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 25 Jul 2014, 01:49 (12 years ago) parent6049d1f
2 files changed+2−2
qml/Shell.qml+1−1 tests/qmltests/tst_Shell.qml+1−1
qml/Shell.qml+1−1
@@ -458,7 +458,7 @@ Item {
458458 ApplicationManager.focusedApplicationId &&
459459 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
460460
461− fullscreenMode: (stages.roughlyFullyShown && topmostApplicationIsFullscreen
461+ fullscreenMode: (topmostApplicationIsFullscreen
462462 && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
463463 }
464464
tests/qmltests/tst_Shell.qml+1−1
@@ -279,7 +279,6 @@ Item {
279279
280280 function dragLauncherIntoView() {
281281 var launcherPanel = findChild(shell, "launcherPanel");
282− print("launcher is at", launcherPanel.x)
283282 verify(launcherPanel.x = - launcherPanel.width);
284283
285284 var touchStartX = 2;
@@ -375,6 +374,7 @@ Item {
375374 sessionSpy.clear()
376375
377376 var greeter = findChild(shell, "greeter")
377+ waitForRendering(greeter)
378378 greeter.show()
379379 tryCompare(greeter, "showProgress", 1)
380380