git.iko.soy/unity8
on xenial help sign in
Moar fixes
9dc8455Andrea Cimitan
qml/Dash/ScopeSettings/ScopeSettingList.qml+3−2
compare with xenial
unifiedsplit
@@ -20,7 +20,9 @@ import Ubuntu.Components.ListItems 1.0 as ListItem
20
20
21ScopeSetting {
21ScopeSetting {
22 id: root
22 id: root
23− height: listItem.height
23+
24+ // FIXME workaround for: https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1355830
25+ height: listItem.currentlyExpanded ? listItem.itemHeight * widgetData.properties["values"].length + units.gu(6) : listItem.height
24
26
25 ListItem.ItemSelector {
27 ListItem.ItemSelector {
26 id: listItem
28 id: listItem
@@ -31,7 +33,6 @@ ScopeSetting {
31 }
33 }
32 text: widgetData.displayName
34 text: widgetData.displayName
33 model: widgetData.properties["values"]
35 model: widgetData.properties["values"]
34− onHeightChanged: console.log("item", height)
35
36
36 onSelectedIndexChanged: root.updated(selectedIndex)
37 onSelectedIndexChanged: root.updated(selectedIndex)
37 }
38 }
tests/autopilot/unity8/shell/emulators/dash.py+4−5
@@ -141,10 +141,9 @@ class Dash(emulators.UnityEmulatorBase):
141
141
142 def enter_search_query(self, query):
142 def enter_search_query(self, query):
143 current_header = self._get_current_page_header()
143 current_header = self._get_current_page_header()
144+ search_button = current_header.select_single(objectName="search_header_button")
144− self.pointing_device.move(current_header.globalRect.x +
145+ self.pointing_device.move(search_button.globalRect.x + search_button.width / 2,
145− current_header.width - current_header.height / 4,
146+ search_button.globalRect.y + search_button.height / 2)
146− current_header.globalRect.y +
147− current_header.height / 4)
148 self.pointing_device.click()
147 self.pointing_device.click()
149 headerContainer = current_header.select_single(objectName="headerContainer")
148 headerContainer = current_header.select_single(objectName="headerContainer")
150 headerContainer.contentY.wait_for(0)
149 headerContainer.contentY.wait_for(0)
@@ -188,7 +187,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
188 # --elopio - 2014-1-14
187 # --elopio - 2014-1-14
189 self.pointing_device.click_object(icon)
188 self.pointing_device.click_object(icon)
190 preview_list = self.wait_select_single(
189 preview_list = self.wait_select_single(
191− 'PreviewListView', objectName='previewListView')
190+ 'QQuickLoader', objectName='subPageLoader')
192 preview_list.x.wait_for(0)
191 preview_list.x.wait_for(0)
193 return preview_list.select_single(
192 return preview_list.select_single(
194 Preview, objectName='preview{}'.format(preview_list.currentIndex))
193 Preview, objectName='preview{}'.format(preview_list.currentIndex))
tests/qmltests/Dash/tst_GenericScopeView.qml+2
@@ -39,6 +39,8 @@ Item {
39
39
40 Scopes {
40 Scopes {
41 id: scopes
41 id: scopes
42+ // for tryGenericScopeView
43+ onLoadedChanged: if (loaded) genericScopeView.scope = scopes.getScope(2);
42 }
44 }
43
45
44 SignalSpy {
46 SignalSpy {