git.iko.soy/unity8
on xenial help sign in
We don't really need to specify maximumNumberOfColumns
commitaa08105635593d34adc7196f854276b47b40df99 authorAlbert Astals <albert.astals@canonical.com> dateThu 5 Jun 2014, 16:23 (12 years ago) parentbc52982
2 files changed+4−19
compare with xenial
unifiedsplit
qml/Components/ResponsiveVerticalJournal.qml+1−2 tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+3−17
qml/Components/ResponsiveVerticalJournal.qml+1−2
@@ -23,7 +23,6 @@ import Dash 0.1
2323// defined column width, delegates are spread in the horizontal space.
2424Item {
2525 property int minimumColumnSpacing: units.gu(1)
26− property int maximumNumberOfColumns: 2
2726
2827 property alias columnWidth: verticalJournalView.columnWidth
2928 property alias rowSpacing: verticalJournalView.rowSpacing
@@ -60,7 +59,7 @@ Item {
6059 return units.gu(spacingGU)
6160 }
6261
63− property int expectedColumns: Math.min(columnsForSpacing(minimumColumnSpacing), maximumNumberOfColumns)
62+ readonly property int expectedColumns: columnsForSpacing(minimumColumnSpacing)
6463 columnSpacing: spacingForColumns(expectedColumns)
6564 }
6665}
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+3−17
@@ -46,12 +46,6 @@ Item {
4646 values: [0, units.gu(2), units.gu(8), units.gu(25)]
4747 selectedIndex: 0
4848 }
49− ListItem.ValueSelector {
50− id: maxColumnsSelector
51− text: "maxColumns"
52− values: [1, 2, 3, 8, 15, fakeModel.count]
53− selectedIndex: 1
54− }
5549 ListItem.ValueSelector {
5650 id: rowSpacingSelector
5751 text: "rowSpacing"
@@ -104,8 +98,6 @@ Item {
10498 model: wrappedFakeModel
10599 minimumColumnSpacing: minColumnSpacingSelector.
106100 values[minColumnSpacingSelector.selectedIndex]
107− maximumNumberOfColumns:
108− maxColumnsSelector.values[maxColumnsSelector.selectedIndex]
109101 rowSpacing:
110102 rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
111103 columnWidth: // XXX karni: How do I get that from the delegate?
@@ -155,7 +147,6 @@ Item {
155147 // Test how minimumColumnSpacing affects column count.
156148 function test_minimumColumnSpacing(data) {
157149 cardSizeSelector.selectedIndex = 2 // large card
158− maxColumnsSelector.selectedIndex = 1 // two columns
159150
160151 minColumnSpacingSelector.selectedIndex = data.minColumnSpacingIndex
161152
@@ -165,14 +156,10 @@ Item {
165156 function test_maximumNumberOfColumns_data() {
166157 var data = new Array()
167158 // Change maxColumns
168− data.push({maxColumnsIndex: 0, cardSizeIndex: 0, expectedColumns: 1})
169− data.push({maxColumnsIndex: 1, cardSizeIndex: 0, expectedColumns: 2})
170− data.push({maxColumnsIndex: 2, cardSizeIndex: 0, expectedColumns: 3})
171− data.push({maxColumnsIndex: 3, cardSizeIndex: 0, expectedColumns: 6})
172− data.push({maxColumnsIndex: 4, cardSizeIndex: 0, expectedColumns: 6})
159+ data.push({cardSizeIndex: 0, expectedColumns: 6})
173160 // Change card size
174− data.push({maxColumnsIndex: 3, cardSizeIndex: 1, expectedColumns: 4})
175− data.push({maxColumnsIndex: 3, cardSizeIndex: 2, expectedColumns: 2})
161+ data.push({cardSizeIndex: 1, expectedColumns: 4})
162+ data.push({cardSizeIndex: 2, expectedColumns: 2})
176163 return data
177164 }
178165
@@ -181,7 +168,6 @@ Item {
181168 minColumnSpacingSelector.selectedIndex = 0 // no spacing
182169
183170 cardSizeSelector.selectedIndex = data.cardSizeIndex // columnWidth
184− maxColumnsSelector.selectedIndex = data.maxColumnsIndex
185171
186172 tryCompareFunction(countJournalDelegatesOnFirstRow, data.expectedColumns)
187173 }