git.iko.soy/unity8
on xenial help sign in
Fix dash emulators.
commitf2fff702b490304a1205eed92f53f50b8bba440f authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 11 Jul 2014, 09:34 (12 years ago) parenta2ab759
2 files changed+10−7
compare with xenial
unifiedsplit
tests/autopilot/unity8/shell/emulators/dash.py+5−2 tests/autopilot/unity8/shell/tests/test_emulators.py+5−5
tests/autopilot/unity8/shell/emulators/dash.py+5−2
@@ -196,9 +196,12 @@ class DashApps(GenericScopeView):
196196 category_element = self._get_category_element(category)
197197 application_cards = category_element.select_many('AbstractButton')
198198
199− # sort by y, x
199+ # sort by y, x, filter those out of view
200+ categoryBottom = category_element.globalRect.y \
201+ + category_element.height
200202 application_cards = sorted(
201− application_cards,
203+ (card for card in application_cards
204+ if card.globalRect.y < categoryBottom),
202205 key=lambda card: (card.globalRect.y, card.globalRect.x))
203206
204207 result = []
tests/autopilot/unity8/shell/tests/test_emulators.py+5−5
@@ -191,9 +191,9 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):
191191 def _get_number_of_application_slots(self, category):
192192 category_element = self.applications_scope._get_category_element(
193193 category)
194− grid = category_element.select_single('CardFilterGrid')
195− filtergrid = grid.select_single('FilterGrid')
196− if (grid.filtered):
197− return filtergrid.collapsedRowCount * filtergrid.columns
194+ cardgrid = category_element.select_single('CardGrid')
195+ if (category_element.expanded):
196+ return cardgrid.select_single('QQuickGridView').count
198197 else:
199− return filtergrid.uncollapsedRowCount * filtergrid.columns
198+ return cardgrid.collapsedRows \
199+ * cardgrid.select_single('ResponsiveGridView').columns