git.iko.soy/unity8
on xenial help sign in
Unwrap lines, make _data functions simpler
9c36009Albert Astals
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+9−18
compare with xenial
unifiedsplit
@@ -96,12 +96,9 @@ Item {
96 id: journal
96 id: journal
97 anchors.fill: parent
97 anchors.fill: parent
98 model: wrappedFakeModel
98 model: wrappedFakeModel
99− minimumColumnSpacing: minColumnSpacingSelector.
99+ minimumColumnSpacing: minColumnSpacingSelector.values[minColumnSpacingSelector.selectedIndex]
100− values[minColumnSpacingSelector.selectedIndex]
101− rowSpacing:
102− rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
100+ rowSpacing: rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
103− columnWidth: // XXX karni: How do I get that from the delegate?
104− cardSizeSelector.values[cardSizeSelector.selectedIndex]
101+ columnWidth: cardSizeSelector.values[cardSizeSelector.selectedIndex]
105
102
106 delegate: Rectangle {
103 delegate: Rectangle {
107 id: delegateItem
104 id: delegateItem
@@ -137,11 +134,9 @@ Item {
137 when: windowShown
134 when: windowShown
138
135
139 function test_minimumColumnSpacing_data() {
136 function test_minimumColumnSpacing_data() {
140− var data = new Array()
137+ return [{minColumnSpacingIndex: 0, expectedColumns: 2},
141− data.push({minColumnSpacingIndex: 0, expectedColumns: 2})
138+ {minColumnSpacingIndex: 1, expectedColumns: 2},
142− data.push({minColumnSpacingIndex: 1, expectedColumns: 2})
139+ {minColumnSpacingIndex: 2, expectedColumns: 1}]
143− data.push({minColumnSpacingIndex: 2, expectedColumns: 1})
144− return data
145 }
140 }
146
141
147 // Test how minimumColumnSpacing affects column count.
142 // Test how minimumColumnSpacing affects column count.
@@ -154,13 +149,9 @@ Item {
154 }
149 }
155
150
156 function test_maximumNumberOfColumns_data() {
151 function test_maximumNumberOfColumns_data() {
157− var data = new Array()
158− // Change maxColumns
159− data.push({cardSizeIndex: 0, expectedColumns: 6})
152+ return [{cardSizeIndex: 0, expectedColumns: 6},
160− // Change card size
161− data.push({cardSizeIndex: 1, expectedColumns: 4})
153+ {cardSizeIndex: 1, expectedColumns: 4},
162− data.push({cardSizeIndex: 2, expectedColumns: 2})
154+ {cardSizeIndex: 2, expectedColumns: 2}]
163− return data
164 }
155 }
165
156
166 // Test how maximumNumberOfColumns and columnWidth affect column count.
157 // Test how maximumNumberOfColumns and columnWidth affect column count.