Use art height as implicitHeight when the header is overlayed and there's no summary
Approved by: Michael Zanetti
commit3e0c31f6e1d0a980a3153e84cb8fdc7c4d728074
authorAlbert Astals Cid <albert.astals@canonical.com>
dateMon 18 May 2015, 23:04 (11 years ago)
parentaf494431a48b18
plugins/Dash/CardCreator.js+2
@@ -644,6 +644,8 @@ function cardString(template, components) {
644644 var implicitHeight = 'implicitHeight: ';
645645 if (hasSummary) {
646646 implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
647+ } else if (headerAsOverlay) {
648+ implicitHeight += 'artShapeHolder.height;\n';
647649 } else if (hasHeaderRow) {
648650 implicitHeight += 'row.y + row.height + units.gu(1);\n';
649651 } else if (hasMascot) {
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -163,5 +163,5 @@ UbuntuShape {
163163 radius: "medium";
164164 borderSource: "radius_pressed.sci"
165165}
166−implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
166+implicitHeight: artShapeHolder.height;
167167}