on xenial help sign in
Reverted visual updates to launcher-icon progress-bar, since they are part of a different branch.
4261c36Mirco Müller
qml/Launcher/LauncherDelegate.qml+10−12
@@ -165,7 +165,7 @@ Item {
165 objectName: "countEmblem"
165 objectName: "countEmblem"
166 anchors {
166 anchors {
167 right: parent.right
167 right: parent.right
168− bottom: parent.bottom
168+ top: parent.top
169 margins: units.dp(3)
169 margins: units.dp(3)
170 }
170 }
171 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
171 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
@@ -190,20 +190,20 @@ Item {
190 }
190 }
191 }
191 }
192
192
193− UbuntuShape {
193+ BorderImage {
194 id: progressOverlay
194 id: progressOverlay
195 objectName: "progressOverlay"
195 objectName: "progressOverlay"
196 anchors {
196 anchors {
197 left: iconItem.left
197 left: iconItem.left
198 right: iconItem.right
198 right: iconItem.right
199− verticalCenter: parent.verticalCenter
199+ bottom: iconItem.bottom
200− leftMargin: units.gu(1.5)
200+ leftMargin: units.gu(1)
201− rightMargin: units.gu(1.5)
201+ rightMargin: units.gu(1)
202+ bottomMargin: units.gu(1)
202 }
203 }
203− height: units.gu(1)
204+ height: units.gu(1.5)
204 visible: root.progress > -1
205 visible: root.progress > -1
205− color: UbuntuColors.darkGrey
206+ source: "graphics/progressbar-trough.sci"
206− borderSource: "none"
207
207
208 // For fill calculation we need to remove the 2 units of border defined in .sci file
208 // For fill calculation we need to remove the 2 units of border defined in .sci file
209 property int adjustedWidth: width - units.gu(2)
209 property int adjustedWidth: width - units.gu(2)
@@ -217,19 +217,17 @@ Item {
217 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
217 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
218 clip: true
218 clip: true
219
219
220− UbuntuShape {
220+ BorderImage {
221 anchors {
221 anchors {
222 left: parent.left
222 left: parent.left
223 top: parent.top
223 top: parent.top
224 bottom: parent.bottom
224 bottom: parent.bottom
225 }
225 }
226− color: "white"
227− borderSource: "none"
228 width: progressOverlay.width
226 width: progressOverlay.width
227+ source: "graphics/progressbar-fill.sci"
229 }
228 }
230 }
229 }
231 }
230 }
232−
233 Image {
231 Image {
234 objectName: "focusedHighlight"
232 objectName: "focusedHighlight"
235 anchors {
233 anchors {
qml/Launcher/graphics/progressbar-fill@30.pngnew file

Binary file not shown.

qml/Launcher/graphics/progressbar-fill@30.scinew file+5
@@ -0,0 +1,5 @@
1+border.left: 36
2+border.top: 16
3+border.bottom: 28
4+border.right: 36
5+source: progressbar-fill@30.png