git.iko.soy/unity8
on xenial help sign in
Make Base not clickable, since we don't use it in anywhere clickable (we only use it for Category delegates in the LVWPH) Fixes: 1300709
c4b1267Albert Astals
qml/Components/ListItems/Base.qml+2−11
compare with xenial
unifiedsplit
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19
19
20−AbstractButton {
20+Item {
21 id: emptyListItem
21 id: emptyListItem
22 width: parent ? parent.width : units.gu(31)
22 width: parent ? parent.width : units.gu(31)
23 height: body.height + bottomDividerLine.height
23 height: body.height + bottomDividerLine.height
@@ -28,15 +28,6 @@ AbstractButton {
28 */
28 */
29 property bool selected: false
29 property bool selected: false
30
30
31− /*!
32− \preliminary
33− Highlight the list item when it is pressed.
34− This is used to disable the highlighting of the full list item
35− when custom highlighting needs to be implemented (for example in
36− ListItem.Standard which can have a split).
37− */
38− property bool highlightWhenPressed: true
39−
40 /*!
31 /*!
41 \preliminary
32 \preliminary
42 Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component).
33 Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component).
@@ -119,7 +110,7 @@ AbstractButton {
119 right: parent.right
110 right: parent.right
120 bottom: bottomDividerLine.top
111 bottom: bottomDividerLine.top
121 }
112 }
122− pressed: (emptyListItem.selected || (emptyListItem.highlightWhenPressed && emptyListItem.pressed)) ? "pressed" : ""
113+ pressed: emptyListItem.selected
123 }
114 }
124 }
115 }
125}
116}
qml/Dash/GenericScopeView.qml−1
@@ -213,7 +213,6 @@ FocusScope {
213 delegate: ListItems.Base {
213 delegate: ListItems.Base {
214 id: baseItem
214 id: baseItem
215 objectName: "dashCategory" + category
215 objectName: "dashCategory" + category
216− highlightWhenPressed: false
217 showDivider: false
216 showDivider: false
218
217
219 property Item seeAllButton: seeAll
218 property Item seeAllButton: seeAll