67edfcc · unity8 · git.iko.soy

qml/Dash/CardFilterGrid.qml+1−4

compare with xenial

unifiedsplit

@@ -21,10 +21,7 @@ DashRenderer {

21 id: genericFilterGrid

22

23 expandable: filterGrid.expandable

24− collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)

25 collapsedHeight: filterGrid.collapsedHeight

24 collapsedHeight: filterGrid.collapsedHeight

26− columns: filterGrid.columns

27− rows: filter ? collapsedRowCount : uncollapsedRowCount

28 margins: filterGrid.margins

25 margins: filterGrid.margins

29 uncollapsedHeight: filterGrid.uncollapsedHeight

26 uncollapsedHeight: filterGrid.uncollapsedHeight

30 verticalSpacing: units.gu(1)

27 verticalSpacing: units.gu(1)

@@ -44,7 +41,7 @@ DashRenderer {

44 verticalSpacing: genericFilterGrid.verticalSpacing

41 verticalSpacing: genericFilterGrid.verticalSpacing

45 model: genericFilterGrid.model

42 model: genericFilterGrid.model

46 filter: genericFilterGrid.filter

43 filter: genericFilterGrid.filter

47− collapsedRowCount: genericFilterGrid.collapsedRowCount

44+ collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)

48 delegateCreationBegin: genericFilterGrid.delegateCreationBegin

45 delegateCreationBegin: genericFilterGrid.delegateCreationBegin

49 delegateCreationEnd: genericFilterGrid.delegateCreationEnd

46 delegateCreationEnd: genericFilterGrid.delegateCreationEnd

50 delegate: Item {

47 delegate: Item {

qml/Dash/DashRenderer.qml−6

@@ -23,14 +23,8 @@ Item {

23 // In case it can be expanded, should we filter it

24 property bool filter: true

25

26− property int collapsedRowCount: 1

27−

28 property int collapsedHeight: height

26 property int collapsedHeight: height

29

27

30− property int columns: 1

31−

32− property int rows: 1

33−

34 property int margins: 0

28 property int margins: 0

35

29

36 property int uncollapsedHeight: height

30 property int uncollapsedHeight: height

tests/autopilot/unity8/shell/tests/test_emulators.py+5−1

@@ -185,7 +185,11 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

185 category_element = self.applications_scope._get_category_element(

186 category)

187 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

189

193

190 def test_open_preview(self):

194 def test_open_preview(self):

191 preview = self.applications_scope.open_preview('2', 'Title.2.1')

195 preview = self.applications_scope.open_preview('2', 'Title.2.1')