git.iko.soy/unity8
on xenial help sign in
Some design nits
a0dba63Michael Terry
qml/Launcher/Launcher.qml+8−4
compare with xenial
unifiedsplit
@@ -69,8 +69,12 @@ Item {
69 animateTimer.start();
69 animateTimer.start();
70 }
70 }
71
71
72− function tease() {
72+ function tease(interval) {
73 if (available && !dragArea.dragging) {
73 if (available && !dragArea.dragging) {
74+ if (interval === undefined) {
75+ interval = 200;
76+ }
77+ teaseTimer.interval = interval;
74 teaseTimer.mode = "teasing"
78 teaseTimer.mode = "teasing"
75 teaseTimer.start();
79 teaseTimer.start();
76 }
80 }
@@ -78,6 +82,7 @@ Item {
78
82
79 function hint() {
83 function hint() {
80 if (available && root.state == "") {
84 if (available && root.state == "") {
85+ teaseTimer.interval = 300;
81 teaseTimer.mode = "hinting"
86 teaseTimer.mode = "hinting"
82 teaseTimer.start();
87 teaseTimer.start();
83 }
88 }
@@ -85,8 +90,7 @@ Item {
85
90
86 Timer {
91 Timer {
87 id: teaseTimer
92 id: teaseTimer
88− interval: mode == "teasing" ? 200 : 300
89− property string mode: "teasing"
93+ property string mode
90 }
94 }
91
95
92 Timer {
96 Timer {
@@ -158,7 +162,7 @@ Item {
158
162
159 MouseArea {
163 MouseArea {
160 id: launcherDragArea
164 id: launcherDragArea
161− enabled: root.state == "visible"
165+ enabled: root.available && root.state == "visible"
162 anchors.fill: panel
166 anchors.fill: panel
163 anchors.rightMargin: -units.gu(2)
167 anchors.rightMargin: -units.gu(2)
164 drag {
168 drag {
qml/Tutorial/TutorialLeft.qml+2−2
@@ -30,10 +30,10 @@ TutorialPage {
30
30
31 Timer {
31 Timer {
32 id: teaseTimer
32 id: teaseTimer
33− interval: 2000
33+ interval: UbuntuAnimation.SleepyDuration
34 repeat: true
34 repeat: true
35 running: !root.paused
35 running: !root.paused
36− onTriggered: root.launcher.tease()
36+ onTriggered: root.launcher.tease(UbuntuAnimation.SleepyDuration)
37 }
37 }
38
38
39 foreground {
39 foreground {
qml/Tutorial/TutorialLeftFinish.qml+1
@@ -22,6 +22,7 @@ TutorialPage {
22
22
23 title: i18n.tr("These are the shortcuts to favorite apps")
23 title: i18n.tr("These are the shortcuts to favorite apps")
24 text: i18n.tr("Tap here to finish.")
24 text: i18n.tr("Tap here to finish.")
25+ fullTextWidth: true
25
26
26 foreground {
27 foreground {
27 children: [
28 children: [
qml/Tutorial/TutorialPage.qml+4−1
@@ -30,6 +30,9 @@ Showable {
30 // Whether animations are paused
30 // Whether animations are paused
31 property bool paused
31 property bool paused
32
32
33+ // Whether to give the text the full width that the title has
34+ property bool fullTextWidth
35+
33 // Whether whole page (background + foreground) or just the foreground fades in
36 // Whether whole page (background + foreground) or just the foreground fades in
34 property bool backgroundFadesIn: false
37 property bool backgroundFadesIn: false
35
38
@@ -136,7 +139,7 @@ Showable {
136 left: parent.left
139 left: parent.left
137 leftMargin: d.sideMargin + d.textXOffset
140 leftMargin: d.sideMargin + d.textXOffset
138 }
141 }
139− width: (parent.width - d.sideMargin * 2) * 0.66
142+ width: (parent.width - d.sideMargin * 2) * (fullTextWidth ? 1 : 0.66)
140 horizontalAlignment: Text.AlignLeft
143 horizontalAlignment: Text.AlignLeft
141 wrapMode: Text.Wrap
144 wrapMode: Text.Wrap
142 font.weight: Font.Light
145 font.weight: Font.Light