git.iko.soy/unity8
on xenial help sign in
We don't really need to specify maximumNumberOfColumns
aa08105Albert Astals
qml/Components/ResponsiveVerticalJournal.qml+1−2
compare with xenial
unifiedsplit
@@ -23,7 +23,6 @@ import Dash 0.1
23// defined column width, delegates are spread in the horizontal space.
23// defined column width, delegates are spread in the horizontal space.
24Item {
24Item {
25 property int minimumColumnSpacing: units.gu(1)
25 property int minimumColumnSpacing: units.gu(1)
26− property int maximumNumberOfColumns: 2
27
26
28 property alias columnWidth: verticalJournalView.columnWidth
27 property alias columnWidth: verticalJournalView.columnWidth
29 property alias rowSpacing: verticalJournalView.rowSpacing
28 property alias rowSpacing: verticalJournalView.rowSpacing
@@ -60,7 +59,7 @@ Item {
60 return units.gu(spacingGU)
59 return units.gu(spacingGU)
61 }
60 }
62
61
63− property int expectedColumns: Math.min(columnsForSpacing(minimumColumnSpacing), maximumNumberOfColumns)
62+ readonly property int expectedColumns: columnsForSpacing(minimumColumnSpacing)
64 columnSpacing: spacingForColumns(expectedColumns)
63 columnSpacing: spacingForColumns(expectedColumns)
65 }
64 }
66}
65}
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+3−17
@@ -46,12 +46,6 @@ Item {
46 values: [0, units.gu(2), units.gu(8), units.gu(25)]
46 values: [0, units.gu(2), units.gu(8), units.gu(25)]
47 selectedIndex: 0
47 selectedIndex: 0
48 }
48 }
49− ListItem.ValueSelector {
50− id: maxColumnsSelector
51− text: "maxColumns"
52− values: [1, 2, 3, 8, 15, fakeModel.count]
53− selectedIndex: 1
54− }
55 ListItem.ValueSelector {
49 ListItem.ValueSelector {
56 id: rowSpacingSelector
50 id: rowSpacingSelector
57 text: "rowSpacing"
51 text: "rowSpacing"
@@ -104,8 +98,6 @@ Item {
104 model: wrappedFakeModel
98 model: wrappedFakeModel
105 minimumColumnSpacing: minColumnSpacingSelector.
99 minimumColumnSpacing: minColumnSpacingSelector.
106 values[minColumnSpacingSelector.selectedIndex]
100 values[minColumnSpacingSelector.selectedIndex]
107− maximumNumberOfColumns:
108− maxColumnsSelector.values[maxColumnsSelector.selectedIndex]
109 rowSpacing:
101 rowSpacing:
110 rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
102 rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
111 columnWidth: // XXX karni: How do I get that from the delegate?
103 columnWidth: // XXX karni: How do I get that from the delegate?
@@ -155,7 +147,6 @@ Item {
155 // Test how minimumColumnSpacing affects column count.
147 // Test how minimumColumnSpacing affects column count.
156 function test_minimumColumnSpacing(data) {
148 function test_minimumColumnSpacing(data) {
157 cardSizeSelector.selectedIndex = 2 // large card
149 cardSizeSelector.selectedIndex = 2 // large card
158− maxColumnsSelector.selectedIndex = 1 // two columns
159
150
160 minColumnSpacingSelector.selectedIndex = data.minColumnSpacingIndex
151 minColumnSpacingSelector.selectedIndex = data.minColumnSpacingIndex
161
152
@@ -165,14 +156,10 @@ Item {
165 function test_maximumNumberOfColumns_data() {
156 function test_maximumNumberOfColumns_data() {
166 var data = new Array()
157 var data = new Array()
167 // Change maxColumns
158 // 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})
173 // Change card size
160 // Change card size
174− data.push({maxColumnsIndex: 3, cardSizeIndex: 1, expectedColumns: 4})
161+ data.push({cardSizeIndex: 1, expectedColumns: 4})
175− data.push({maxColumnsIndex: 3, cardSizeIndex: 2, expectedColumns: 2})
162+ data.push({cardSizeIndex: 2, expectedColumns: 2})
176 return data
163 return data
177 }
164 }
178
165
@@ -181,7 +168,6 @@ Item {
181 minColumnSpacingSelector.selectedIndex = 0 // no spacing
168 minColumnSpacingSelector.selectedIndex = 0 // no spacing
182
169
183 cardSizeSelector.selectedIndex = data.cardSizeIndex // columnWidth
170 cardSizeSelector.selectedIndex = data.cardSizeIndex // columnWidth
184− maxColumnsSelector.selectedIndex = data.maxColumnsIndex
185
171
186 tryCompareFunction(countJournalDelegatesOnFirstRow, data.expectedColumns)
172 tryCompareFunction(countJournalDelegatesOnFirstRow, data.expectedColumns)
187 }
173 }