Merge lp:~unity-team/unity8/fix-card-implicitHeight into lp:unity8

[Andrea Cimitan]

Fix card implicitHeight when summary is declared, but its text is empty. Also fixes vertical journal height and clipping

 * 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?
Of course
 * 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

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
CI is taking a nap

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1246
http://jenkins.qa.ubuntu.com/job/unity8-ci/4573/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5737/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1667
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5397/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6989
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6989/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14402

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-10-02 11:08:44 +0000
+++ plugins/Dash/CardCreator.js	2014-10-02 11:08:44 +0000
@@ -627,7 +627,7 @@
 
     var implicitHeight = 'implicitHeight: ';
     if (hasSummary) {
-        implicitHeight += 'summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
+        implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
     } else if (hasHeaderRow) {
         implicitHeight += 'row.y + row.height + units.gu(1);\n';
     } else if (hasMascot) {

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2014-06-20 10:06:50 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2014-10-02 11:08:44 +0000
@@ -47,7 +47,9 @@
     property alias delegate: verticalJournalView.delegate
     property alias displayMarginBeginning: verticalJournalView.displayMarginBeginning
     property alias displayMarginEnd: verticalJournalView.displayMarginEnd
-    implicitHeight: verticalJournalView.implicitHeight
+
+    implicitHeight: verticalJournalView.implicitHeight + rowSpacing
+    clip: height < implicitHeight
 
     VerticalJournal {
         id: verticalJournalView
@@ -59,7 +61,6 @@
             topMargin: rowSpacing / 2
             bottomMargin: rowSpacing / 2
         }
-        clip: parent.height != implicitHeight
 
         function px2gu(pixels) {
             return Math.floor(pixels / units.gu(1))

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-10-02 11:08:44 +0000
+++ qml/Dash/DashRenderer.qml	2014-10-02 11:08:44 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.0
 
 Item {
-    property int collapsedHeight
+    property real collapsedHeight
 
-    property int expandedHeight
+    property real expandedHeight
 
     property int collapsedItemCount: -1