git.iko.soy/unity8
on xenial help sign in
Moar fixes
commit9dc845504aa1634e22f22f29d393fb2a5676eed6 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 12 Aug 2014, 17:17 (12 years ago) parent74ee45e
3 files changed+9−7
compare with xenial
unifiedsplit
qml/Dash/ScopeSettings/ScopeSettingList.qml+3−2 tests/autopilot/unity8/shell/emulators/dash.py+4−5 tests/qmltests/Dash/tst_GenericScopeView.qml+2
qml/Dash/ScopeSettings/ScopeSettingList.qml+3−2
@@ -20,7 +20,9 @@ import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121ScopeSetting {
2222 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
2426
2527 ListItem.ItemSelector {
2628 id: listItem
@@ -31,7 +33,6 @@ ScopeSetting {
3133 }
3234 text: widgetData.displayName
3335 model: widgetData.properties["values"]
34− onHeightChanged: console.log("item", height)
3536
3637 onSelectedIndexChanged: root.updated(selectedIndex)
3738 }
tests/autopilot/unity8/shell/emulators/dash.py+4−5
@@ -141,10 +141,9 @@ class Dash(emulators.UnityEmulatorBase):
141141
142142 def enter_search_query(self, query):
143143 current_header = self._get_current_page_header()
144− self.pointing_device.move(current_header.globalRect.x +
145− current_header.width - current_header.height / 4,
146− current_header.globalRect.y +
147− current_header.height / 4)
144+ search_button = current_header.select_single(objectName="search_header_button")
145+ self.pointing_device.move(search_button.globalRect.x + search_button.width / 2,
146+ search_button.globalRect.y + search_button.height / 2)
148147 self.pointing_device.click()
149148 headerContainer = current_header.select_single(objectName="headerContainer")
150149 headerContainer.contentY.wait_for(0)
@@ -188,7 +187,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
188187 # --elopio - 2014-1-14
189188 self.pointing_device.click_object(icon)
190189 preview_list = self.wait_select_single(
191− 'PreviewListView', objectName='previewListView')
190+ 'QQuickLoader', objectName='subPageLoader')
192191 preview_list.x.wait_for(0)
193192 return preview_list.select_single(
194193 Preview, objectName='preview{}'.format(preview_list.currentIndex))
tests/qmltests/Dash/tst_GenericScopeView.qml+2
@@ -39,6 +39,8 @@ Item {
3939
4040 Scopes {
4141 id: scopes
42+ // for tryGenericScopeView
43+ onLoadedChanged: if (loaded) genericScopeView.scope = scopes.getScope(2);
4244 }
4345
4446 SignalSpy {