Merge lp:~mzanetti/unity8/launcher-new-count-emblem into lp:unity8

Proposed by Michael Zanetti on 2014-07-16
Status: Merged
Approved by: Andrea Cimitan on 2014-07-29
Approved revision: 1048
Merged at revision: 1100
Proposed branch: lp:~mzanetti/unity8/launcher-new-count-emblem
Merge into: lp:unity8
Diff against target: 54 lines (+9/-11)
2 files modified
qml/Launcher/LauncherDelegate.qml (+9/-6)
qml/Launcher/graphics/notification@30.sci (+0/-5)
To merge this branch: bzr merge lp:~mzanetti/unity8/launcher-new-count-emblem
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-07-29
Andrea Cimitan (community) 2014-07-16 Approve on 2014-07-29
Vesa Rautiainen (community) design 2014-07-16 Approve on 2014-07-18
Review via email: mp+226998@code.launchpad.net

Commit message

update launcher count emblems to match new spec

Description of the change

Screenshot for easier design review: http://i.imgur.com/bqTxKQx.png

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

requested in here

To post a comment you must log in.
Vesa Rautiainen (vesar) :
review: Approve (design)
1047. By Michael Zanetti on 2014-07-29

some tweaks requested by the reviewer

1048. By Michael Zanetti on 2014-07-29

add fixme

Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Launcher/LauncherDelegate.qml'
2--- qml/Launcher/LauncherDelegate.qml 2014-07-09 19:45:23 +0000
3+++ qml/Launcher/LauncherDelegate.qml 2014-07-29 10:22:56 +0000
4@@ -70,28 +70,31 @@
5 height: root.itemHeight - units.gu(1)
6 }
7
8- BorderImage {
9+ UbuntuShape {
10 objectName: "countEmblem"
11 anchors {
12 right: parent.right
13 top: parent.top
14 margins: units.dp(3)
15 }
16- width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))
17- height: units.gu(3)
18- source: "graphics/notification.sci"
19+ width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
20+ height: units.gu(2)
21+ color: UbuntuColors.orange
22 visible: root.count > 0
23+ borderSource: "none"
24
25 Label {
26 id: countLabel
27 text: root.count
28 anchors.centerIn: parent
29+ // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine
30+ // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479
31+ anchors.verticalCenterOffset: -units.dp(.5)
32 width: root.itemWidth - units.gu(1)
33 horizontalAlignment: Text.AlignHCenter
34 elide: Text.ElideRight
35 color: "white"
36- fontSize: "small"
37- font.bold: true
38+ fontSize: "x-small"
39 }
40 }
41
42
43=== removed file 'qml/Launcher/graphics/notification@30.png'
44Binary files qml/Launcher/graphics/notification@30.png 2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/notification@30.png 1970-01-01 00:00:00 +0000 differ
45=== removed file 'qml/Launcher/graphics/notification@30.sci'
46--- qml/Launcher/graphics/notification@30.sci 2013-08-19 19:34:03 +0000
47+++ qml/Launcher/graphics/notification@30.sci 1970-01-01 00:00:00 +0000
48@@ -1,5 +0,0 @@
49-border.left: 36
50-border.top: 36
51-border.bottom: 36
52-border.right: 36
53-source: notification@30.png
54\ No newline at end of file

Subscribers

People subscribed via source and target branches