git.iko.soy/unity8
on xenial help sign in
Fix header width.
c5fce11Michał Sawicz
Dash/CardHeader.qml+3−1
compare with xenial
unifiedsplit
@@ -15,6 +15,7 @@ Item {
15
15
16 Row {
16 Row {
17 id: row
17 id: row
18+ objectName: "outerRow"
18
19
19 anchors { top: parent.top; left: parent.left; right: parent.right; margins: spacing }
20 anchors { top: parent.top; left: parent.left; right: parent.right; margins: spacing }
20 spacing: units.gu(1)
21 spacing: units.gu(1)
@@ -34,7 +35,8 @@ Item {
34 }
35 }
35
36
36 Column {
37 Column {
38+ objectName: "column"
37− width: parent.width - x - row.spacing
39+ width: parent.width - x
38
40
39 Label {
41 Label {
40 id: titleLabel
42 id: titleLabel
tests/qmltests/Dash/tst_CardHeader.qml+19
@@ -31,6 +31,8 @@ Rectangle {
31 property Item subtitleLabel: findChild(cardHeader, "subtitleLabel")
31 property Item subtitleLabel: findChild(cardHeader, "subtitleLabel")
32 property Item prices: findChild(cardHeader, "prices")
32 property Item prices: findChild(cardHeader, "prices")
33 property Item oldPriceLabel: findChild(cardHeader, "oldPriceLabel")
33 property Item oldPriceLabel: findChild(cardHeader, "oldPriceLabel")
34+ property Item outerRow: findChild(cardHeader, "outerRow")
35+ property Item column: findChild(cardHeader, "column")
34
36
35 function initTestCase() {
37 function initTestCase() {
36 verify(testCase.mascot !== undefined, "Couldn't find mascot object.");
38 verify(testCase.mascot !== undefined, "Couldn't find mascot object.");
@@ -101,5 +103,22 @@ Rectangle {
101 compare(testCase.oldPriceLabel.horizontalAlignment, data.oldAlign, "Old price label is aligned wrong.")
103 compare(testCase.oldPriceLabel.horizontalAlignment, data.oldAlign, "Old price label is aligned wrong.")
102 }
104 }
103 }
105 }
106+
107+ function test_dimensions_data() {
108+ return [
109+ { tag: "Column width", object: column, width: cardHeader.width - testCase.outerRow.spacing * 2 },
110+ { tag: "Column width", object: column, width: cardHeader.width - mascot.width - testCase.outerRow.spacing * 3, mascot: "artwork/avatar.png" }
111+ ]
112+ }
113+
114+ function test_dimensions(data) {
115+ if (data.hasOwnProperty("mascot")) {
116+ cardHeader.mascot = data.mascot;
117+ }
118+
119+ if (data.hasOwnProperty("width")) {
120+ tryCompare(data.object, "width", data.width);
121+ }
122+ }
104 }
123 }
105}
124}