git.iko.soy/unity8
on xenial help sign in
add a threshold vor up/down drag in spread
4f47a9cMichael Zanetti
qml/Stage/Spread/SpreadDelegateInputArea.qml+17−12
compare with xenial
unifiedsplit
@@ -22,6 +22,7 @@ Item {
22 property bool moving: false
22 property bool moving: false
23 property var dragEvents: []
23 property var dragEvents: []
24 property real dragVelocity: 0
24 property real dragVelocity: 0
25+ property int threshold: units.gu(2)
25
26
26 // Can be replaced with a fake implementation during tests
27 // Can be replaced with a fake implementation during tests
27 // property var __getCurrentTimeMs: function () { return new Date().getTime() }
28 // property var __getCurrentTimeMs: function () { return new Date().getTime() }
@@ -80,14 +81,13 @@ Item {
80 anchors.fill: parent
81 anchors.fill: parent
81 mouseEnabled: false
82 mouseEnabled: false
82 maximumTouchPoints: 1
83 maximumTouchPoints: 1
84+ property int offset: 0
83
85
84− onGestureStarted: {
86+ touchPoints: [
85− if (!d.moving) {
87+ TouchPoint {
86− d.moving = true
88+ id: tp
87− gesture.grab();
88− d.dragEvents = []
89 }
89 }
90− }
90+ ]
91
91
92 onCanceled: {
92 onCanceled: {
93 d.moving = false
93 d.moving = false
@@ -95,14 +95,19 @@ Item {
95 }
95 }
96
96
97 onTouchUpdated: {
97 onTouchUpdated: {
98− if (touchPoints.length == 0 || !d.moving) {
98+ if (!d.moving) {
99+ if (Math.abs(tp.startY - tp.y) > d.threshold) {
100+ d.moving = true;
101+ d.dragEvents = []
102+ offset = tp.y - tp.startY;
103+ } else {
99− return;
104+ return;
105+ }
100 }
106 }
101
107
102− var touchPoint = touchPoints[0];
103− d.distance = touchPoint.y - touchPoint.startY
108+ d.distance = tp.y - tp.startY - offset
104− d.pushDragEvent(touchPoint);
109+ d.pushDragEvent(tp);
105− print("pushed event", touchPoint.y, "velocity is now", d.dragVelocity)
110+ print("pushed event", tp.y, "velocity is now", d.dragVelocity)
106 }
111 }
107
112
108 onReleased: {
113 onReleased: {