Merge lp:~aacid/unity8/card_height_overlay_header into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1773
Merged at revision: 1786
Proposed branch: lp:~aacid/unity8/card_height_overlay_header
Merge into: lp:unity8
Diff against target: 23 lines (+3/-1)
2 files modified
plugins/Dash/CardCreator.js (+2/-0)
tests/plugins/Dash/cardcreator/5.res (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/card_height_overlay_header
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Zanetti (community) Approve
Review via email: mp+258756@code.launchpad.net

Commit message

Use art height as implicitHeight when the header is overlayed and there's no summary

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
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?
N/A

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) 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.

waiting

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

yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

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-02-24 10:16:09 +0000
3+++ plugins/Dash/CardCreator.js 2015-05-11 11:32:35 +0000
4@@ -631,6 +631,8 @@
5 var implicitHeight = 'implicitHeight: ';
6 if (hasSummary) {
7 implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
8+ } else if (headerAsOverlay) {
9+ implicitHeight += 'artShapeHolder.height;\n';
10 } else if (hasHeaderRow) {
11 implicitHeight += 'row.y + row.height + units.gu(1);\n';
12 } else if (hasMascot) {
13
14=== modified file 'tests/plugins/Dash/cardcreator/5.res'
15--- tests/plugins/Dash/cardcreator/5.res 2015-02-17 11:42:03 +0000
16+++ tests/plugins/Dash/cardcreator/5.res 2015-05-11 11:32:35 +0000
17@@ -150,5 +150,5 @@
18 radius: "medium";
19 borderSource: "radius_pressed.sci"
20 }
21-implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
22+implicitHeight: artShapeHolder.height;
23 }

Subscribers

People subscribed via source and target branches