We don't allow Dash Overview from a search screen
commitdab1fac28c8dabc3bfc720c8f0b64be0b54652c8
authorAlbert Astals <albert.astals@canonical.com>
dateWed 16 Jul 2014, 13:13 (12 years ago)
parentbb20be8
qml/Dash/Dash.qml+1−1
@@ -279,7 +279,7 @@ Showable {
279279 z: 1
280280 direction: Direction.Upwards
281281 // TODO this needs to be disabled in a few more cases
282− enabled: overviewController.progress == 0 || dragging
282+ enabled: dashContent.currentScope.searchQuery == "" && (overviewController.progress == 0 || dragging)
283283
284284 readonly property real fullMovement: units.gu(20)
285285
qml/Dash/DashContent.qml+1
@@ -27,6 +27,7 @@ Item {
2727 property var scopes: null
2828 readonly property alias currentIndex: dashContentList.currentIndex
2929 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
30+ readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
3031
3132 signal scopeLoaded(string scopeId)
3233 signal gotoScope(string scopeId)