git.iko.soy/unity8
on xenial help sign in
Fix card implicitHeight when summary is declared, but its text is empty. Also fixes vertical journal height and clipping Fixes: 1362160

Approved by: Albert Astals Cid

commita966812c3675d5c76eb1f3e3f5ac99d1d1b3400b authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 9 Oct 2014, 14:03 (12 years ago) parentc4b126756c2922
3 files changed+6−5
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+1−1 qml/Components/ResponsiveVerticalJournal.qml+3−2 qml/Dash/DashRenderer.qml+2−2
plugins/Dash/CardCreator.js+1−1
@@ -624,7 +624,7 @@ function cardString(template, components) {
624624
625625 var implicitHeight = 'implicitHeight: ';
626626 if (hasSummary) {
627− implicitHeight += 'summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
627+ implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
628628 } else if (hasHeaderRow) {
629629 implicitHeight += 'row.y + row.height + units.gu(1);\n';
630630 } else if (hasMascot) {
qml/Components/ResponsiveVerticalJournal.qml+3−2
@@ -47,7 +47,9 @@ Item {
4747 property alias delegate: verticalJournalView.delegate
4848 property alias displayMarginBeginning: verticalJournalView.displayMarginBeginning
4949 property alias displayMarginEnd: verticalJournalView.displayMarginEnd
50− implicitHeight: verticalJournalView.implicitHeight
50+
51+ implicitHeight: verticalJournalView.implicitHeight + rowSpacing
52+ clip: height < implicitHeight
5153
5254 VerticalJournal {
5355 id: verticalJournalView
@@ -59,7 +61,6 @@ Item {
5961 topMargin: rowSpacing / 2
6062 bottomMargin: rowSpacing / 2
6163 }
62− clip: parent.height != implicitHeight
6364
6465 function px2gu(pixels) {
6566 return Math.floor(pixels / units.gu(1))
qml/Dash/DashRenderer.qml+2−2
@@ -17,9 +17,9 @@
1717import QtQuick 2.0
1818
1919Item {
20− property int collapsedHeight
20+ property real collapsedHeight
2121
22− property int expandedHeight
22+ property real expandedHeight
2323
2424 property int collapsedItemCount: -1
2525