git.iko.soy/unity8
on xenial help sign in
Fix launcher being left exposed after TutorialLeft screen
9e6283fMichael Terry
qml/Tutorial/TutorialLeft.qml+5−3
compare with xenial
unifiedsplit
@@ -48,9 +48,8 @@ TutorialPage {
48 SequentialAnimation {
48 SequentialAnimation {
49 id: teaseAnimation
49 id: teaseAnimation
50 paused: running && root.paused
50 paused: running && root.paused
51− running: !slider.active && root.launcher.visibleWidth === 0
51+ running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
52 loops: Animation.Infinite
52 loops: Animation.Infinite
53− alwaysRunToEnd: true
54
53
55 UbuntuNumberAnimation {
54 UbuntuNumberAnimation {
56 target: root.launcher
55 target: root.launcher
@@ -69,7 +68,10 @@ TutorialPage {
69 Timer {
68 Timer {
70 id: finishTimer
69 id: finishTimer
71 interval: 1
70 interval: 1
72− onTriggered: root.hide()
71+ onTriggered: {
72+ root.hide();
73+ root.launcher.x = 0; // make sure to reset launcher before we go
74+ }
73 }
75 }
74
76
75 foreground {
77 foreground {