git.iko.soy/unity8
on xenial help sign in
Enable taps, pass correct params to preview and activate
7281c48Michal Hruby
qml/Dash/Card.qml+1−1
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−Item {
20+AbstractButton {
21 id: root
21 id: root
22 property var template
22 property var template
23 property var components
23 property var components
qml/Dash/CardFilterGrid.qml+3−3
@@ -27,13 +27,13 @@ DashFilterGrid {
27 verticalSpacing: units.gu(2)
27 verticalSpacing: units.gu(2)
28
28
29 delegate: Card {
29 delegate: Card {
30− id: tile
30+ id: card
31 objectName: "delegate" + index
31 objectName: "delegate" + index
32 cardData: model
32 cardData: model
33 template: genericFilterGrid.template
33 template: genericFilterGrid.template
34 components: genericFilterGrid.components
34 components: genericFilterGrid.components
35
35
36− //onClicked: genericFilterGrid.clicked(index, tile.y)
36+ onClicked: genericFilterGrid.clicked(index, card.y)
37− //onPressAndHold: genericFilterGrid.pressAndHold(index, tile.y)
37+ onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
38 }
38 }
39}
39}
qml/Dash/GenericScopeView.qml+2−4
@@ -200,13 +200,11 @@ FocusScope {
200
200
201 if ((scopeView.scope.id == "applications.scope" && categoryId == "installed")
201 if ((scopeView.scope.id == "applications.scope" && categoryId == "installed")
202 || (scopeView.scope.id == "home.scope" && categoryId == "applications.scope")) {
202 || (scopeView.scope.id == "home.scope" && categoryId == "applications.scope")) {
203− scopeView.scope.activate(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
203+ scopeView.scope.activate(item.result)
204− item.comment, item.dndUri, item.metadata)
205 } else {
204 } else {
206 previewListView.open = true
205 previewListView.open = true
207
206
208− scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
207+ scopeView.scope.preview(item.result)
209− item.comment, item.dndUri, item.metadata)
210 }
208 }
211 }
209 }
212 onPressAndHold: {
210 onPressAndHold: {