on xenial help sign in
Fix broken merge
b7df604Albert Astals
qml/Dash/Dash.qml+4−4
@@ -319,9 +319,9 @@ Showable {
319
319
320 onSceneDistanceChanged: {
320 onSceneDistanceChanged: {
321 if (status == DirectionalDragArea.Recognized && initialSceneDistance != -1) {
321 if (status == DirectionalDragArea.Recognized && initialSceneDistance != -1) {
322− overviewController.enableAnimation = false;
322+ bottomEdgeController.enableAnimation = false;
323 var deltaDistance = sceneDistance - initialSceneDistance;
323 var deltaDistance = sceneDistance - initialSceneDistance;
324− overviewController.progress = Math.max(0, Math.min(1, deltaDistance / fullMovement));
324+ bottomEdgeController.progress = Math.max(0, Math.min(1, deltaDistance / fullMovement));
325 }
325 }
326 }
326 }
327
327
@@ -337,8 +337,8 @@ Showable {
337 initialSceneDistance = sceneDistance;
337 initialSceneDistance = sceneDistance;
338 } else if (status == DirectionalDragArea.WaitingForTouch &&
338 } else if (status == DirectionalDragArea.WaitingForTouch &&
339 previousStatus == DirectionalDragArea.Recognized) {
339 previousStatus == DirectionalDragArea.Recognized) {
340− overviewController.enableAnimation = true;
340+ bottomEdgeController.enableAnimation = true;
341− overviewController.progress = (overviewController.progress > 0.7) ? 1 : 0;
341+ bottomEdgeController.progress = (bottomEdgeController.progress > 0.7) ? 1 : 0;
342 initialSceneDistance = -1;
342 initialSceneDistance = -1;
343 }
343 }
344 }
344 }