on xenial help sign in
Fix 1231996
commitf1682cc27889016be96e7bfa87e5e20ab2aa81b6 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateWed 23 Oct 2013, 18:31 (13 years ago) parentf2920dd
2 files changed+5−2
Launcher/Launcher.qml+1−1 Shell.qml+4−1
Launcher/Launcher.qml+1−1
@@ -29,7 +29,7 @@ Item {
2929 property int panelWidth: units.gu(8)
3030 property int dragAreaWidth: units.gu(1)
3131 property int minimizeDistance: panelWidth * 2.5
32− property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
32+ property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
3333 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
3434
3535 readonly property bool shown: panel.x > -panel.width
Shell.qml+4−1
@@ -647,19 +647,22 @@ FocusScope {
647647 Launcher {
648648 id: launcher
649649
650+ readonly property bool dashSwipe: progress > 0
651+
650652 anchors.top: parent.top
651653 anchors.bottom: parent.bottom
652654 width: parent.width
653655 dragAreaWidth: shell.edgeSize
654656 available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
657+
655658 onDashItemSelected: showHome()
656659 onDash: {
657660 if (stages.shown) {
658− dash.setCurrentScope("applications.scope", true /* animate */, true /* reset */)
659661 stages.hide();
660662 launcher.hide();
661663 }
662664 }
665+ onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("applications.scope", false, true)
663666 onLauncherApplicationSelected:{
664667 greeter.hide()
665668 shell.activateApplication(appId)