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

[Albert Astals Cid]

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

 * 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

[Michael Zanetti (mzanetti)]

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1773
http://jenkins.qa.ubuntu.com/job/unity8-ci/5704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2706/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/870
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2337/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20358

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-02-24 10:16:09 +0000
+++ plugins/Dash/CardCreator.js	2015-05-11 11:32:35 +0000
@@ -631,6 +631,8 @@
     var implicitHeight = 'implicitHeight: ';
     if (hasSummary) {
         implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
+    } else if (headerAsOverlay) {
+        implicitHeight += 'artShapeHolder.height;\n';
     } else if (hasHeaderRow) {
         implicitHeight += 'row.y + row.height + units.gu(1);\n';
     } else if (hasMascot) {

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2015-02-17 11:42:03 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-05-11 11:32:35 +0000
@@ -150,5 +150,5 @@
     radius: "medium"; 
     borderSource: "radius_pressed.sci" 
 }
-implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
+implicitHeight: artShapeHolder.height;
 }