Unity 8

Merge lp:~cimi/unity8/fix-long-subtitle-card into lp:unity8

  1. fix-long-subtitle-card
  2. Merge into trunk
Proposed by Andrea Cimitan on 2015-02-17
Status: Merged
Approved by: Albert Astals Cid on 2015-02-17
Approved revision: 1614
Merged at revision: 1628
Proposed branch: lp:~cimi/unity8/fix-long-subtitle-card
Merge into: lp:unity8
Diff against target: 83 lines (+7/-0)
7 files modified
plugins/Dash/CardCreator.js (+1/-0)
tests/plugins/Dash/cardcreator/2.res (+1/-0)
tests/plugins/Dash/cardcreator/3.res (+1/-0)
tests/plugins/Dash/cardcreator/4.res (+1/-0)
tests/plugins/Dash/cardcreator/5.res (+1/-0)
tests/plugins/Dash/cardcreator/6.res (+1/-0)
tests/plugins/Dash/cardcreator/7.res (+1/-0)
To merge this branch: bzr merge lp:~cimi/unity8/fix-long-subtitle-card
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2015-02-17 Approve on 2015-02-17
PS Jenkins bot continuous-integration Needs Fixing on 2015-02-17
Review via email: mp+249984@code.launchpad.net

Commit Message

Add maximumLineCount for subtitle label in cards

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * 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?
n/a

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1614
http://jenkins.qa.ubuntu.com/job/unity8-ci/5328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1386
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/492
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18106

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5328/rebuild

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

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

 * Did CI run pass?
No, breakage caused by Qt 5.4

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2015-01-22 12:05:43 +0000
3+++ plugins/Dash/CardCreator.js 2015-02-17 11:47:36 +0000
4@@ -255,6 +255,7 @@
5 anchors { %1 } \n\
6 anchors.topMargin: units.dp(2); \n\
7 elide: Text.ElideRight; \n\
8+ maximumLineCount: 1; \n\
9 fontSize: "x-small"; \n\
10 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
11 color: %2; \n\
12
13=== modified file 'tests/plugins/Dash/cardcreator/2.res'
14--- tests/plugins/Dash/cardcreator/2.res 2014-11-05 08:37:55 +0000
15+++ tests/plugins/Dash/cardcreator/2.res 2015-02-17 11:47:36 +0000
16@@ -109,6 +109,7 @@
17 }
18 anchors.topMargin: units.dp(2);
19 elide: Text.ElideRight;
20+ maximumLineCount: 1;
21 fontSize: "x-small";
22 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
23 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
24
25=== modified file 'tests/plugins/Dash/cardcreator/3.res'
26--- tests/plugins/Dash/cardcreator/3.res 2014-11-05 08:37:55 +0000
27+++ tests/plugins/Dash/cardcreator/3.res 2015-02-17 11:47:36 +0000
28@@ -89,6 +89,7 @@
29 }
30 anchors.topMargin: units.dp(2);
31 elide: Text.ElideRight;
32+ maximumLineCount: 1;
33 fontSize: "x-small";
34 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
35 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
36
37=== modified file 'tests/plugins/Dash/cardcreator/4.res'
38--- tests/plugins/Dash/cardcreator/4.res 2014-11-05 08:37:55 +0000
39+++ tests/plugins/Dash/cardcreator/4.res 2015-02-17 11:47:36 +0000
40@@ -89,6 +89,7 @@
41 }
42 anchors.topMargin: units.dp(2);
43 elide: Text.ElideRight;
44+ maximumLineCount: 1;
45 fontSize: "x-small";
46 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
47 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
48
49=== modified file 'tests/plugins/Dash/cardcreator/5.res'
50--- tests/plugins/Dash/cardcreator/5.res 2014-11-05 08:37:55 +0000
51+++ tests/plugins/Dash/cardcreator/5.res 2015-02-17 11:47:36 +0000
52@@ -134,6 +134,7 @@
53 }
54 anchors.topMargin: units.dp(2);
55 elide: Text.ElideRight;
56+ maximumLineCount: 1;
57 fontSize: "x-small";
58 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
59 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
60
61=== modified file 'tests/plugins/Dash/cardcreator/6.res'
62--- tests/plugins/Dash/cardcreator/6.res 2014-11-17 10:09:40 +0000
63+++ tests/plugins/Dash/cardcreator/6.res 2015-02-17 11:47:36 +0000
64@@ -88,6 +88,7 @@
65 }
66 anchors.topMargin: units.dp(2);
67 elide: Text.ElideRight;
68+ maximumLineCount: 1;
69 fontSize: "x-small";
70 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
71 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
72
73=== modified file 'tests/plugins/Dash/cardcreator/7.res'
74--- tests/plugins/Dash/cardcreator/7.res 2014-11-05 08:37:55 +0000
75+++ tests/plugins/Dash/cardcreator/7.res 2015-02-17 11:47:36 +0000
76@@ -110,6 +110,7 @@
77 }
78 anchors.topMargin: units.dp(2);
79 elide: Text.ElideRight;
80+ maximumLineCount: 1;
81 fontSize: "x-small";
82 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
83 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

Subscribers

People subscribed via source and target branches