git.iko.soy/unity8
on xenial help sign in
Actually word wrap
commit6d54e35d0148a3b3f2d65029dfed4380d68e7b7d authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 20 Jan 2015, 10:47 (12 years ago) parentc44da69
2 files changed+5−3
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewTable.qml+3−1 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+2−2
qml/Dash/Previews/PreviewTable.qml+3−1
@@ -74,7 +74,9 @@ PreviewWidget {
7474 visible: root.expanded || rowIndex < maximumCollapsedRowCount
7575 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
7676 font.bold: index == 0
77− elide: Text.ElideRight
77+ verticalAlignment: Text.AlignTop
78+ wrapMode: Text.WordWrap
79+ Layout.fillHeight: true
7880 Layout.maximumWidth: column.width - x
7981 }
8082 }
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+2−2
@@ -32,7 +32,7 @@ Rectangle {
3232 }
3333
3434 property var widgetDataNoTitle: {
35− "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
35+ "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
3636 }
3737
3838 PreviewWidgetFactory {
@@ -60,7 +60,7 @@ Rectangle {
6060 compare(findChild(previewTable, "label00").text, "Long Label 1");
6161 compare(findChild(previewTable, "label01").text, "Value 1");
6262 compare(findChild(previewTable, "label10").text, "Label 2");
63− compare(findChild(previewTable, "label11").text, "Long Value 2");
63+ compare(findChild(previewTable, "label11").text, "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2");
6464 compare(findChild(previewTable, "label20").text, "Label 3");
6565 compare(findChild(previewTable, "label21").text, "Value 3");
6666 compare(findChild(previewTable, "label30").text, "Label 4");