on xenial help sign in
Fix ScopesList not being under finger

Do not take into the account the initial distance that took the movement to be accepted to calculate the position

commitc84a2e5f5ce45c04611ecd2dac978a20b6657a7a authorAlbert Astals <albert.astals@canonical.com> dateMon 5 Jan 2015, 12:24 (12 years ago) parentab98493
1 file changed+3−8
qml/Dash/Dash.qml+3−8
qml/Dash/Dash.qml+3−8
@@ -335,28 +335,23 @@ Showable {
335335 height: units.gu(2)
336336
337337 onSceneDistanceChanged: {
338− if (status == DirectionalDragArea.Recognized && initialSceneDistance != -1) {
338+ if (status == DirectionalDragArea.Recognized) {
339339 bottomEdgeController.enableAnimation = false;
340− var deltaDistance = sceneDistance - initialSceneDistance;
341− bottomEdgeController.progress = Math.max(0, Math.min(1, deltaDistance / fullMovement));
340+ bottomEdgeController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
342341 }
343342 }
344343
345344 property int previousStatus: -1
346345 property int currentStatus: DirectionalDragArea.WaitingForTouch
347− property real initialSceneDistance: -1
348346
349347 onStatusChanged: {
350348 previousStatus = currentStatus;
351349 currentStatus = status;
352350
353− if (status == DirectionalDragArea.Recognized) {
354− initialSceneDistance = sceneDistance;
355− } else if (status == DirectionalDragArea.WaitingForTouch &&
351+ if (status == DirectionalDragArea.WaitingForTouch &&
356352 previousStatus == DirectionalDragArea.Recognized) {
357353 bottomEdgeController.enableAnimation = true;
358354 bottomEdgeController.progress = (bottomEdgeController.progress > 0.2) ? 1 : 0;
359− initialSceneDistance = -1;
360355 }
361356 }
362357 }