git.iko.soy/unity8
on xenial help sign in
Merge lp:~aacid/unity8/removeUnusedDashRendererProperties
commit67edfcccd4943396cc033030df07517cc6494150 authorAlbert Astals <albert.astals@canonical.com> dateMon 31 Mar 2014, 14:33 (13 years ago) parent8534d2a2c2225f
3 files changed+6−11
compare with xenial
unifiedsplit
qml/Dash/CardFilterGrid.qml+1−4 qml/Dash/DashRenderer.qml−6 tests/autopilot/unity8/shell/tests/test_emulators.py+5−1
qml/Dash/CardFilterGrid.qml+1−4
@@ -21,10 +21,7 @@ DashRenderer {
2121 id: genericFilterGrid
2222
2323 expandable: filterGrid.expandable
24− collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
2524 collapsedHeight: filterGrid.collapsedHeight
26− columns: filterGrid.columns
27− rows: filter ? collapsedRowCount : uncollapsedRowCount
2825 margins: filterGrid.margins
2926 uncollapsedHeight: filterGrid.uncollapsedHeight
3027 verticalSpacing: units.gu(1)
@@ -44,7 +41,7 @@ DashRenderer {
4441 verticalSpacing: genericFilterGrid.verticalSpacing
4542 model: genericFilterGrid.model
4643 filter: genericFilterGrid.filter
47− collapsedRowCount: genericFilterGrid.collapsedRowCount
44+ collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
4845 delegateCreationBegin: genericFilterGrid.delegateCreationBegin
4946 delegateCreationEnd: genericFilterGrid.delegateCreationEnd
5047 delegate: Item {
qml/Dash/DashRenderer.qml−6
@@ -23,14 +23,8 @@ Item {
2323 // In case it can be expanded, should we filter it
2424 property bool filter: true
2525
26− property int collapsedRowCount: 1
27−
2826 property int collapsedHeight: height
2927
30− property int columns: 1
31−
32− property int rows: 1
33−
3428 property int margins: 0
3529
3630 property int uncollapsedHeight: height
tests/autopilot/unity8/shell/tests/test_emulators.py+5−1
@@ -185,7 +185,11 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):
185185 category_element = self.applications_scope._get_category_element(
186186 category)
187187 grid = category_element.select_single('CardFilterGrid')
188− return grid.columns * grid.rows
188+ filtergrid = grid.select_single('FilterGrid')
189+ if (grid.filter):
190+ return filtergrid.collapsedRowCount * filtergrid.columns
191+ else:
192+ return filtergrid.uncollapsedRowCount * filtergrid.columns
189193
190194 def test_open_preview(self):
191195 preview = self.applications_scope.open_preview('2', 'Title.2.1')