6d54e35 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Actually word wrap

6d54e35Albert Astals Cid12 years ago

qml/Dash/Previews/PreviewTable.qml+3−1

compare with xenial

unifiedsplit

@@ -74,7 +74,9 @@ PreviewWidget {

74 visible: root.expanded || rowIndex < maximumCollapsedRowCount

75 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

76 font.bold: index == 0

77− elide: Text.ElideRight

77+ verticalAlignment: Text.AlignTop

78+ wrapMode: Text.WordWrap

79+ Layout.fillHeight: true

78 Layout.maximumWidth: column.width - x

80 Layout.maximumWidth: column.width - x

79 }

81 }

80 }

82 }

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

@@ -32,7 +32,7 @@ Rectangle {

32 }

34 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"] ]

36 }

38 PreviewWidgetFactory {

@@ -60,7 +60,7 @@ Rectangle {

60 compare(findChild(previewTable, "label00").text, "Long Label 1");

61 compare(findChild(previewTable, "label01").text, "Value 1");

62 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");

64 compare(findChild(previewTable, "label20").text, "Label 3");

65 compare(findChild(previewTable, "label21").text, "Value 3");

66 compare(findChild(previewTable, "label30").text, "Label 4");