@@ -77,7 +77,6 @@ Showable {
7777 QtObject {
7878 id: overviewController
7979
80− property bool accepted: false
8180 property alias enableAnimation: progressAnimation.enabled
8281 property real progress: 0
8382 property bool showingNonFavoriteScope: false
@@ -129,7 +128,6 @@ Showable {
129128 function hide() {
130129 overviewController.enableAnimation = true;
131130 overviewController.progress = 0;
132− overviewController.accepted = false;
133131 }
134132 function animateDashFromAll() {
135133 var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);
@@ -276,27 +274,22 @@ Showable {
276274 id: overviewDragHandle
277275 z: 1
278276 direction: Direction.Upwards
279− distanceThreshold: units.gu(20)
280277 // TODO this needs to be disabled in a few more cases
281− enabled: !overviewController.accepted || dragging
278+ enabled: overviewController.progress == 0 || dragging
279+
280+ readonly property real fullMovement: units.gu(20)
282281
283282 anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
284283 height: units.gu(2)
285284
286285 onSceneDistanceChanged: {
287286 overviewController.enableAnimation = false;
288− overviewController.progress = Math.max(0, Math.min(1, sceneDistance / distanceThreshold));
289− }
290−
291− onStatusChanged: {
292− if (status == DirectionalDragArea.Recognized) {
293− overviewController.accepted = true;
294− }
287+ overviewController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
295288 }
296289
297290 onDraggingChanged: {
298291 overviewController.enableAnimation = true;
299− overviewController.progress = overviewController.accepted ? 1 : 0;
292+ overviewController.progress = (overviewController.progress > 0.7) ? 1 : 0;
300293 }
301294 }
302295