git.iko.soy/unity8
on xenial help sign in
disable overview when on preview
58df12bAlbert 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: dashContent.currentScope.searchQuery == "" && (overviewController.progress == 0 || dragging)
282+ enabled: !dashContent.previewShown && 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
@@ -28,6 +28,7 @@ Item {
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 readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
31+ readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ? dashContentList.currentItem.item.previewShown : false
31
32
32 signal scopeLoaded(string scopeId)
33 signal scopeLoaded(string scopeId)
33 signal gotoScope(string scopeId)
34 signal gotoScope(string scopeId)
qml/Dash/GenericScopeView.qml+1
@@ -33,6 +33,7 @@ FocusScope {
33 property bool hasBackAction: false
33 property bool hasBackAction: false
34 property bool enableHeightBehaviorOnNextCreation: false
34 property bool enableHeightBehaviorOnNextCreation: false
35 property var categoryView: categoryView
35 property var categoryView: categoryView
36+ readonly property alias previewShown: previewListView.open
36
37
37 property var scopeStyle: ScopeStyle {
38 property var scopeStyle: ScopeStyle {
38 style: scope ? scope.customizations : {}
39 style: scope ? scope.customizations : {}