disable overview when on preview
commit58df12bbedf360fd5dd21076fee16df2d5fedbac
authorAlbert Astals <albert.astals@canonical.com>
dateWed 16 Jul 2014, 13:28 (12 years ago)
parentdab1fac
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: dashContent.currentScope.searchQuery == "" && (overviewController.progress == 0 || dragging)
282+ enabled: !dashContent.previewShown && dashContent.currentScope.searchQuery == "" && (overviewController.progress == 0 || dragging)
283283
284284 readonly property real fullMovement: units.gu(20)
285285
qml/Dash/DashContent.qml+1
@@ -28,6 +28,7 @@ Item {
2828 readonly property alias currentIndex: dashContentList.currentIndex
2929 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
3030 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
3132
3233 signal scopeLoaded(string scopeId)
3334 signal gotoScope(string scopeId)
qml/Dash/GenericScopeView.qml+1
@@ -33,6 +33,7 @@ FocusScope {
3333 property bool hasBackAction: false
3434 property bool enableHeightBehaviorOnNextCreation: false
3535 property var categoryView: categoryView
36+ readonly property alias previewShown: previewListView.open
3637
3738 property var scopeStyle: ScopeStyle {
3839 style: scope ? scope.customizations : {}