@@ -48,23 +48,17 @@ Showable {
4848 */
4949 readonly property bool active: available && visible
5050
51− property color __orange_transparent: Qt.hsla(16.0/360.0, 0.83, 0.47, 0.4)
52− property int __edge_margin: units.gu(4)
53− property int __text_margin: units.gu(3)
54− property bool __skip_on_hide: false
55− property int __anim_running: wholeAnimation.running // for testing
56−
5751 signal skip()
5852
5953 function doSkip() {
60− __skip_on_hide = true;
54+ d.skipOnHide = true;
6155 hide();
6256 }
6357
6458 function hideNow() {
6559 overlay.visible = false;
6660 overlay.available = false;
67− if (overlay.__skip_on_hide) {
61+ if (d.skipOnHide) {
6862 overlay.skip();
6963 }
7064 }
@@ -81,6 +75,12 @@ Showable {
8175 onRunningChanged: if (!running) overlay.hideNow()
8276 }
8377
78+ QtObject {
79+ id: d
80+ property bool skipOnHide: false
81+ property int edgeMargin: units.gu(4)
82+ }
83+
8484 Rectangle {
8585 anchors.fill: parent
8686 color: "black"
@@ -105,10 +105,10 @@ Showable {
105105 Column {
106106 id: labelGroup
107107 layer.enabled: true // otherwise the underlining on "Skip intro" jumps
108− spacing: overlay.__text_margin
108+ spacing: units.gu(3)
109109
110110 anchors {
111− margins: overlay.__edge_margin
111+ margins: d.edgeMargin
112112 left: parent.left
113113 top: overlay.edge == "bottom" ? undefined : parent.top
114114 bottom: overlay.edge == "bottom" ? parent.bottom : undefined
@@ -150,7 +150,7 @@ Showable {
150150 gradient: Gradient {
151151 GradientStop {
152152 position: 0.0
153− color: overlay.__orange_transparent
153+ color: Qt.hsla(16.0/360.0, 0.83, 0.47, 0.4) // UbuntuColors.orange, but transparent
154154 }
155155 GradientStop {
156156 position: 1.0
@@ -185,6 +185,7 @@ Showable {
185185
186186 SequentialAnimation {
187187 id: wholeAnimation
188+ objectName: "wholeAnimation"
188189 running: overlay.active
189190
190191 ParallelAnimation {
@@ -203,12 +204,12 @@ Showable {
203204 }
204205 from: {
205206 if (overlay.edge == "right") {
206− return overlay.__edge_margin + units.gu(3)
207+ return d.edgeMargin + units.gu(3)
207208 } else {
208− return overlay.__edge_margin - units.gu(3)
209+ return d.edgeMargin - units.gu(3)
209210 }
210211 }
211− to: overlay.__edge_margin
212+ to: d.edgeMargin
212213 duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration
213214 }
214215 StandardAnimation {
@@ -251,7 +252,7 @@ Showable {
251252 if (status == Powerd.Off && wholeAnimation.running) {
252253 wholeAnimation.pause();
253254 } else if (status == Powerd.On) {
254− wholeAnimation.pause();
255+ wholeAnimation.resume();
255256 }
256257 }
257258 }