on xenial help sign in
Reverted visual updates to launcher-icon progress-bar, since they are part of a different branch.
commit4261c3695f941966b282ff98efc01f4d6b7d24bf authorMirco Müller <mirco.mueller@canonical.com> dateTue 14 Jul 2015, 12:41 (11 years ago) parent99b1063
3 files changed+15−12
qml/Launcher/LauncherDelegate.qml+10−12 qml/Launcher/graphics/progressbar-fill@30.png qml/Launcher/graphics/progressbar-fill@30.sci+5
qml/Launcher/LauncherDelegate.qml+10−12
@@ -165,7 +165,7 @@ Item {
165165 objectName: "countEmblem"
166166 anchors {
167167 right: parent.right
168− bottom: parent.bottom
168+ top: parent.top
169169 margins: units.dp(3)
170170 }
171171 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
@@ -190,20 +190,20 @@ Item {
190190 }
191191 }
192192
193− UbuntuShape {
193+ BorderImage {
194194 id: progressOverlay
195195 objectName: "progressOverlay"
196196 anchors {
197197 left: iconItem.left
198198 right: iconItem.right
199− verticalCenter: parent.verticalCenter
200− leftMargin: units.gu(1.5)
201− rightMargin: units.gu(1.5)
199+ bottom: iconItem.bottom
200+ leftMargin: units.gu(1)
201+ rightMargin: units.gu(1)
202+ bottomMargin: units.gu(1)
202203 }
203− height: units.gu(1)
204+ height: units.gu(1.5)
204205 visible: root.progress > -1
205− color: UbuntuColors.darkGrey
206− borderSource: "none"
206+ source: "graphics/progressbar-trough.sci"
207207
208208 // For fill calculation we need to remove the 2 units of border defined in .sci file
209209 property int adjustedWidth: width - units.gu(2)
@@ -217,19 +217,17 @@ Item {
217217 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
218218 clip: true
219219
220− UbuntuShape {
220+ BorderImage {
221221 anchors {
222222 left: parent.left
223223 top: parent.top
224224 bottom: parent.bottom
225225 }
226− color: "white"
227− borderSource: "none"
228226 width: progressOverlay.width
227+ source: "graphics/progressbar-fill.sci"
229228 }
230229 }
231230 }
232−
233231 Image {
234232 objectName: "focusedHighlight"
235233 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