git.iko.soy/unity8
on xenial help sign in
Update count-emblem position to bottom right, update progress-bar visual to latest design.
029bac7Mirco Müller
qml/Launcher/LauncherDelegate.qml+12−11
compare with xenial
unifiedsplit
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19
19
20Item {
20Item {
21 id: root
21 id: root
@@ -75,7 +75,7 @@ Item {
75 objectName: "countEmblem"
75 objectName: "countEmblem"
76 anchors {
76 anchors {
77 right: parent.right
77 right: parent.right
78− top: parent.top
78+ bottom: parent.bottom
79 margins: units.dp(3)
79 margins: units.dp(3)
80 }
80 }
81 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
81 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
@@ -100,20 +100,20 @@ Item {
100 }
100 }
101 }
101 }
102
102
103− BorderImage {
103+ UbuntuShape {
104 id: progressOverlay
104 id: progressOverlay
105 objectName: "progressOverlay"
105 objectName: "progressOverlay"
106 anchors {
106 anchors {
107 left: iconItem.left
107 left: iconItem.left
108 right: iconItem.right
108 right: iconItem.right
109− bottom: iconItem.bottom
109+ verticalCenter: parent.verticalCenter
110− leftMargin: units.gu(1)
110+ leftMargin: units.gu(1.5)
111− rightMargin: units.gu(1)
111+ rightMargin: units.gu(1.5)
112− bottomMargin: units.gu(1)
113 }
112 }
114− height: units.gu(1.5)
113+ height: units.gu(1)
115 visible: root.progress > -1
114 visible: root.progress > -1
116− source: "graphics/progressbar-trough.sci"
115+ color: UbuntuColors.darkGrey
116+ borderSource: "none"
117
117
118 // For fill calculation we need to remove the 2 units of border defined in .sci file
118 // For fill calculation we need to remove the 2 units of border defined in .sci file
119 property int adjustedWidth: width - units.gu(2)
119 property int adjustedWidth: width - units.gu(2)
@@ -127,14 +127,15 @@ Item {
127 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
127 width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
128 clip: true
128 clip: true
129
129
130− BorderImage {
130+ UbuntuShape {
131 anchors {
131 anchors {
132 left: parent.left
132 left: parent.left
133 top: parent.top
133 top: parent.top
134 bottom: parent.bottom
134 bottom: parent.bottom
135 }
135 }
136+ color: "white"
137+ borderSource: "none"
136 width: progressOverlay.width
138 width: progressOverlay.width
137− source: "graphics/progressbar-fill.sci"
138 }
139 }
139 }
140 }
140 }
141 }
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