git.iko.soy/unity8
on xenial help sign in
We don't allow Dash Overview from a search screen
dab1facAlbert Astals
qml/Dash/Dash.qml+1−1
compare with xenial
unifiedsplit
@@ -279,7 +279,7 @@ Showable {
279 z: 1
279 z: 1
280 direction: Direction.Upwards
280 direction: Direction.Upwards
281 // TODO this needs to be disabled in a few more cases
281 // 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)
283
283
284 readonly property real fullMovement: units.gu(20)
284 readonly property real fullMovement: units.gu(20)
285
285
qml/Dash/DashContent.qml+1
@@ -27,6 +27,7 @@ Item {
27 property var scopes: null
27 property var scopes: null
28 readonly property alias currentIndex: dashContentList.currentIndex
28 readonly property alias currentIndex: dashContentList.currentIndex
29 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
29 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
30+ readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
30
31
31 signal scopeLoaded(string scopeId)
32 signal scopeLoaded(string scopeId)
32 signal gotoScope(string scopeId)
33 signal gotoScope(string scopeId)