on xenial help sign in
And fix the tutorial to even notice when the spread is shown
4abe6ceMichael Terry
qml/Stages/DesktopStage.qml+3
@@ -36,6 +36,9 @@ AbstractStage {
36 }
36 }
37 }
37 }
38
38
39+ // Used by TutorialRight
40+ property bool spreadShown: spread.state == "altTab"
41+
39 mainApp: ApplicationManager.focusedApplicationId
42 mainApp: ApplicationManager.focusedApplicationId
40 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
43 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
41 : null
44 : null
tests/qmltests/Tutorial/tst_Tutorial.qml+16
@@ -764,6 +764,22 @@ Rectangle {
764 tryCompare(tutorialRightLoader, "shown", true);
764 tryCompare(tutorialRightLoader, "shown", true);
765 }
765 }
766
766
767+ function test_desktopTutorialRightFinish() {
768+ loadShell("desktop");
769+
770+ var tutorialRight = findChild(shell, "tutorialRight");
771+ ApplicationManager.startApplication("dialer-app");
772+ ApplicationManager.startApplication("camera-app");
773+ tryCompare(tutorialRight, "shown", true);
774+
775+ var stage = findChild(shell, "stage");
776+ mouseMove(shell, shell.width, shell.height / 2);
777+ stage.pushRightEdge(units.gu(8));
778+ tryCompare(tutorialRight, "shown", false);
779+
780+ tryCompare(AccountsService, "demoEdges", false);
781+ }
782+
767 function test_oskDoesNotHideTutorial() {
783 function test_oskDoesNotHideTutorial() {
768 var tutorialLeft = findChild(shell, "tutorialLeft");
784 var tutorialLeft = findChild(shell, "tutorialLeft");
769 verify(tutorialLeft.shown);
785 verify(tutorialLeft.shown);