on xenial help sign in
Don't let tutorial grow launcher past its own width
commite059c2f88c29f77a113cd0c4260f6df9296a0df2 authorMichael Terry <michael.terry@canonical.com> dateThu 14 May 2015, 10:32 (11 years ago) parent2fa460b
1 file changed+11−4
qml/Tutorial/TutorialLeft.qml+11−4
qml/Tutorial/TutorialLeft.qml+11−4
@@ -49,21 +49,28 @@ TutorialPage {
4949 paused: running && root.paused
5050 running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
5151 loops: Animation.Infinite
52+ property real bounce: 0
5253
5354 UbuntuNumberAnimation {
54− target: root.launcher
55− property: "x"
55+ target: teaseAnimation
56+ property: "bounce"
5657 to: units.gu(2)
5758 duration: UbuntuAnimation.SleepyDuration
5859 }
5960 UbuntuNumberAnimation {
60− target: root.launcher
61− property: "x"
61+ target: teaseAnimation
62+ property: "bounce"
6263 to: 0
6364 duration: UbuntuAnimation.SleepyDuration
6465 }
6566 }
6667
68+ Binding {
69+ target: root.launcher
70+ property: "x"
71+ value: Math.min(root.launcher.panelWidth - root.launcher.visibleWidth, teaseAnimation.bounce)
72+ }
73+
6774 Timer {
6875 id: finishTimer
6976 interval: 1