git.iko.soy/unity8
on xenial help sign in
fix fullscreen, stabilize tests
aad693fMichael Zanetti
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -458,7 +458,7 @@ Item {
458 ApplicationManager.focusedApplicationId &&
458 ApplicationManager.focusedApplicationId &&
459 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
459 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
460
460
461− fullscreenMode: (stages.roughlyFullyShown && topmostApplicationIsFullscreen
461+ fullscreenMode: (topmostApplicationIsFullscreen
462 && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
462 && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
463 }
463 }
464
464
tests/qmltests/tst_Shell.qml+1−1
@@ -279,7 +279,6 @@ Item {
279
279
280 function dragLauncherIntoView() {
280 function dragLauncherIntoView() {
281 var launcherPanel = findChild(shell, "launcherPanel");
281 var launcherPanel = findChild(shell, "launcherPanel");
282− print("launcher is at", launcherPanel.x)
283 verify(launcherPanel.x = - launcherPanel.width);
282 verify(launcherPanel.x = - launcherPanel.width);
284
283
285 var touchStartX = 2;
284 var touchStartX = 2;
@@ -375,6 +374,7 @@ Item {
375 sessionSpy.clear()
374 sessionSpy.clear()
376
375
377 var greeter = findChild(shell, "greeter")
376 var greeter = findChild(shell, "greeter")
377+ waitForRendering(greeter)
378 greeter.show()
378 greeter.show()
379 tryCompare(greeter, "showProgress", 1)
379 tryCompare(greeter, "showProgress", 1)
380
380