c84a2e5 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix ScopesList not being under finger

c84a2e5Albert Astals12 years ago

qml/Dash/Dash.qml+3−8

compare with xenial

unifiedsplit

@@ -335,28 +335,23 @@ Showable {

335 height: units.gu(2)

336

337 onSceneDistanceChanged: {

338− if (status == DirectionalDragArea.Recognized && initialSceneDistance != -1) {

338+ if (status == DirectionalDragArea.Recognized) {

339 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));

342 }

341 }

343 }

342 }

344

343

345 property int previousStatus: -1

344 property int previousStatus: -1

346 property int currentStatus: DirectionalDragArea.WaitingForTouch

345 property int currentStatus: DirectionalDragArea.WaitingForTouch

347− property real initialSceneDistance: -1

348

346

349 onStatusChanged: {

347 onStatusChanged: {

350 previousStatus = currentStatus;

348 previousStatus = currentStatus;

351 currentStatus = status;

349 currentStatus = status;

352

350

353− if (status == DirectionalDragArea.Recognized) {

351+ if (status == DirectionalDragArea.WaitingForTouch &&

354− initialSceneDistance = sceneDistance;

355− } else if (status == DirectionalDragArea.WaitingForTouch &&

356 previousStatus == DirectionalDragArea.Recognized) {

352 previousStatus == DirectionalDragArea.Recognized) {

357 bottomEdgeController.enableAnimation = true;

353 bottomEdgeController.enableAnimation = true;

358 bottomEdgeController.progress = (bottomEdgeController.progress > 0.2) ? 1 : 0;

354 bottomEdgeController.progress = (bottomEdgeController.progress > 0.2) ? 1 : 0;

359− initialSceneDistance = -1;

360 }

355 }

361 }

356 }

362 }

357 }