git.iko.soy/unity8
on xenial help sign in
Make sure the spinner does get too close to the title text
29705e2Albert Astals Cid
qml/Stages/Splash.qml+3−6
compare with xenial
unifiedsplit
@@ -119,6 +119,7 @@ Item {
119 }
119 }
120
120
121 Label {
121 Label {
122+ id: titleLabel
122 text: root.title
123 text: root.title
123 anchors.horizontalCenter: parent.horizontalCenter
124 anchors.horizontalCenter: parent.horizontalCenter
124 anchors.top: iconShape.bottom
125 anchors.top: iconShape.bottom
@@ -137,12 +138,8 @@ Item {
137
138
138 ActivityIndicator {
139 ActivityIndicator {
139 id: spinner
140 id: spinner
140− anchors.centerIn: header.visible ? parent : undefined
141+ anchors.centerIn: parent
141− anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
142+ anchors.verticalCenterOffset: header.visible ? header.height / 2 : Math.max(titleLabel.y / 2, units.gu(8))
142−
143− anchors.horizontalCenter: header.visible ? undefined : parent.horizontalCenter
144− anchors.bottom: header.visible ? undefined : parent.bottom
145− anchors.bottomMargin: header.visible ? 0 : units.gu(12)
146 }
143 }
147
144
148 MouseArea {
145 MouseArea {