ba65d48 · unity8 · git.iko.soy

git.iko.soy/unity8

workaround for bad row height on Qt 5.4 (on the phone)

commitba65d48263177c69e5552acbe03909708b6dc077 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 11 Oct 2016, 16:30 (10 years ago) parent12fb435

2 files changed+4−1

compare with xenial

unifiedsplit

qml/Dash/Previews/PreviewTable.qml+3 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+1−1

qml/Dash/Previews/PreviewTable.qml+3

@@ -78,6 +78,9 @@ PreviewWidget {

7878 Layout.alignment: Qt.AlignTop

7979 Layout.maximumWidth: index == 0 ? column.width / 4 : column.width - x

8080 Layout.minimumWidth: index == 0 ? column.width / 4 : -1

81+ height: -1 // FIXME Qt 5.4 needs this otherwise wrapped columns

82+ // get the height wrong and the next row looks weird

83+ // remove once we stop supporting Qt 5.4 (if 5.5 doesn't need it)

8184 }

8285 }

8386 }

tests/qmltests/Dash/Previews/tst_PreviewTable.qml+1−1

@@ -33,7 +33,7 @@ Rectangle {

3333

3434 property var widgetDataComplete2: {

3535 "title": "Short Title here",

36− "values": [ [ "Label A", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Author", "Best 3v3r"], [ "Summary", "If i knew how to write summaries i'd be working somewhere else"] ]

36+ "values": [ [ "Publisher/Creator", "Unity8 team" ], [ "Label A", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Author", "Best 3v3r"], [ "Summary", "If i knew how to write summaries i'd be working somewhere else"] ]

3737 }

3838

3939 property var widgetDataNoTitle: {