de36445 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix ScopesList not being under finger

de36445Albert Astals12 years ago

qml/Dash/Dash.qml+3−8

compare with xenial

unifiedsplit

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

334 height: units.gu(2)

335

336 onSceneDistanceChanged: {

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

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

338 bottomEdgeController.enableAnimation = false;

339− var deltaDistance = sceneDistance - initialSceneDistance;

340− bottomEdgeController.progress = Math.max(0, Math.min(1, deltaDistance / fullMovement));

339+ bottomEdgeController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));

341 }

340 }

342 }

341 }

343

342

344 property int previousStatus: -1

343 property int previousStatus: -1

345 property int currentStatus: DirectionalDragArea.WaitingForTouch

344 property int currentStatus: DirectionalDragArea.WaitingForTouch

346− property real initialSceneDistance: -1

347

345

348 onStatusChanged: {

346 onStatusChanged: {

349 previousStatus = currentStatus;

347 previousStatus = currentStatus;

350 currentStatus = status;

348 currentStatus = status;

351

349

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

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

353− initialSceneDistance = sceneDistance;

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

355 previousStatus == DirectionalDragArea.Recognized) {

351 previousStatus == DirectionalDragArea.Recognized) {

356 bottomEdgeController.enableAnimation = true;

352 bottomEdgeController.enableAnimation = true;

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

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

358− initialSceneDistance = -1;

359 }

354 }

360 }

355 }

361 }

356 }