Merge lp:~aacid/unity8/listitemworkaround into lp:unity8

Proposed by Albert Astals Cid on 2016-03-14
Status: Merged
Approved by: Michael Terry on 2016-03-15
Approved revision: 2051
Merged at revision: 2300
Proposed branch: lp:~aacid/unity8/listitemworkaround
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/valueslider_filter
Diff against target: 35 lines (+5/-2)
2 files modified
qml/Dash/DashNavigationList.qml (+3/-1)
qml/Dash/PageHeaderExtraPanel.qml (+2/-1)
To merge this branch: bzr merge lp:~aacid/unity8/listitemworkaround
Reviewer Review Type Date Requested Status
Michael Terry 2016-03-14 Approve on 2016-03-15
Unity8 CI Bot continuous-integration Needs Fixing on 2016-03-14
Review via email: mp+288933@code.launchpad.net

Commit Message

Workaround SDK ListItem bug

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
Prereq

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
lp:~aacid/unity8/listitemworkaround updated on 2016-03-14
2051. By Albert Astals Cid on 2016-03-14

import is used here elsewhere

Michael Terry (mterry) wrote :

Code seems fine. But I couldn't actually reproduce the original bug? I was pressing on search categories on the app scope and store. Is it a different navigational element here?

Albert Astals Cid (aacid) wrote :

Did you follow the reproduction instructions mzanetti gives in the bug? It's relatively easy to reproduce them here with those long press + small move movements ehre.

Michael Terry (mterry) wrote :

OK, reflashed. Reproduced without this change, couldn't with. Code seems simple enough, and even includes pointers to bug to remove it. Great! :)

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yes

 * Did CI run pass? If not, please explain why.
 no... but for seemingly unrelated reasons

 * Did you make sure that the branch does not contain spurious tags?
 Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/DashNavigationList.qml'
2--- qml/Dash/DashNavigationList.qml 2016-03-14 14:43:44 +0000
3+++ qml/Dash/DashNavigationList.qml 2016-03-14 14:43:44 +0000
4@@ -16,6 +16,7 @@
5
6 import QtQuick 2.4
7 import Ubuntu.Components 1.3
8+import Ubuntu.Components.ListItems 1.3 as ListItems
9 import "../Components"
10
11 Item {
12@@ -52,7 +53,8 @@
13 Repeater {
14 model: navigation && navigation.loaded ? navigation : null
15 clip: true
16- delegate: ListItem {
17+ // FIXME Move to ListItem (and remove import) once 1556971 is fixed
18+ delegate: ListItems.Empty {
19 objectName: root.objectName + "child" + index
20 height: root.itemHeight
21 width: column.width
22
23=== modified file 'qml/Dash/PageHeaderExtraPanel.qml'
24--- qml/Dash/PageHeaderExtraPanel.qml 2016-03-14 14:43:44 +0000
25+++ qml/Dash/PageHeaderExtraPanel.qml 2016-03-14 14:43:44 +0000
26@@ -92,7 +92,8 @@
27 objectName: "recentSearchesRepeater"
28 model: searchHistory
29
30- delegate: ListItem {
31+ // FIXME Move to ListItem once 1556971 is fixed
32+ delegate: ListItems.Empty {
33 anchors {
34 left: parent.left
35 right: parent.right

Subscribers

People subscribed via source and target branches