on xenial help sign in
Update count-emblem position to bottom right, update progress-bar visual to latest design.
commit029bac7668fb80b52765a3eec7d76e6530d79067 authorMirco Müller <mirco.mueller@canonical.com> dateWed 20 May 2015, 11:38 (11 years ago) parente96d05a
5 files changed+12−21
qml/Launcher/LauncherDelegate.qml+12−11 qml/Launcher/graphics/progressbar-fill@30.png qml/Launcher/graphics/progressbar-fill@30.sci−5 qml/Launcher/graphics/progressbar-trough@30.png qml/Launcher/graphics/progressbar-trough@30.sci−5
qml/Launcher/LauncherDelegate.qml+12−11
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
1919
2020Item {
2121 id: root
@@ -75,7 +75,7 @@ Item {
7575 objectName: "countEmblem"
7676 anchors {
7777 right: parent.right
78− top: parent.top
78+ bottom: parent.bottom
7979 margins: units.dp(3)
8080 }
8181 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
@@ -100,20 +100,20 @@ Item {
100100 }
101101 }
102102
103− BorderImage {
103+ UbuntuShape {
104104 id: progressOverlay
105105 objectName: "progressOverlay"
106106 anchors {
107107 left: iconItem.left
108108 right: iconItem.right
109− bottom: iconItem.bottom
110− leftMargin: units.gu(1)
111− rightMargin: units.gu(1)
112− bottomMargin: units.gu(1)
109+ verticalCenter: parent.verticalCenter
110+ leftMargin: units.gu(1.5)
111+ rightMargin: units.gu(1.5)
113112 }
114− height: units.gu(1.5)
113+ height: units.gu(1)
115114 visible: root.progress > -1
116− source: "graphics/progressbar-trough.sci"
115+ color: UbuntuColors.darkGrey
116+ borderSource: "none"
117117
118118 // For fill calculation we need to remove the 2 units of border defined in .sci file
119119 property int adjustedWidth: width - units.gu(2)
@@ -127,14 +127,15 @@ Item {
127127 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
128128 clip: true
129129
130− BorderImage {
130+ UbuntuShape {
131131 anchors {
132132 left: parent.left
133133 top: parent.top
134134 bottom: parent.bottom
135135 }
136+ color: "white"
137+ borderSource: "none"
136138 width: progressOverlay.width
137− source: "graphics/progressbar-fill.sci"
138139 }
139140 }
140141 }
qml/Launcher/graphics/progressbar-fill@30.pngdeleted

Binary file not shown.

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

Binary file not shown.

qml/Launcher/graphics/progressbar-trough@30.scideleted−5
@@ -1,5 +0,0 @@
1−border.left: 36
2−border.top: 16
3−border.bottom: 26
4−border.right: 36
5−source: progressbar-trough@30.png