Move properties into grouped "point" property

Change-Id: I80000110a2e0ca69210322a0fcc587d86158358e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

8 files changed, 39 insertions, 36 deletions

diff --git a/tests/manual/pointer/content/FakeFlickable.qml b/tests/manual/pointer/content/FakeFlickable.qml
index 801b6b9f31..55dafef82e 100644
--- a/tests/manual/pointer/content/FakeFlickable.qml
+++ b/tests/manual/pointer/content/FakeFlickable.qml
@@ -83,7 +83,7 @@ Item {
 
         DragHandler {
             id: dragHandler
-            onActiveChanged: if (!active) anim.restart(velocity)
+            onActiveChanged: if (!active) anim.restart(point.velocity)
         }
         MomentumAnimation {
             id: anim
diff --git a/tests/manual/pointer/content/ScrollBar.qml b/tests/manual/pointer/content/ScrollBar.qml
index 94d5ae47a7..ef18ceb98f 100644
--- a/tests/manual/pointer/content/ScrollBar.qml
+++ b/tests/manual/pointer/content/ScrollBar.qml
@@ -71,9 +71,9 @@ Rectangle {
         id: tap
         onTapped: {
             if (knob.state === "horizontal")
-                knob.x = pos.x - knob.width / 2
+                knob.x = position.x - knob.width / 2
             else if (knob.state === "vertical")
-                knob.y = pos.y - knob.height / 2
+                knob.y = position.y - knob.height / 2
         }
     }
 
diff --git a/tests/manual/pointer/fakeFlickable.qml b/tests/manual/pointer/fakeFlickable.qml
index 22b23a00c8..0c6dbe4558 100644
--- a/tests/manual/pointer/fakeFlickable.qml
+++ b/tests/manual/pointer/fakeFlickable.qml
@@ -75,7 +75,7 @@ Rectangle {
 
 
         onFlickStarted: console.log("flick started with velocity " + velocity)
-        onFlickEnded: console.log("flick ended")
+        onFlickEnded: console.log("flick ended with velocity " + velocity)
 
         Component.onCompleted: {
             var request = new XMLHttpRequest()
diff --git a/tests/manual/pointer/flingAnimation.qml b/tests/manual/pointer/flingAnimation.qml
index c8722fabb1..d868fcc498 100644
--- a/tests/manual/pointer/flingAnimation.qml
+++ b/tests/manual/pointer/flingAnimation.qml
@@ -70,7 +70,7 @@ Rectangle {
                 objectName: "dragHandler" + index
                 onActiveChanged: {
                     if (!active)
-                        anim.restart(velocity)
+                        anim.restart(point.velocity)
                 }
             }
             Rectangle {
diff --git a/tests/manual/pointer/photosurface.qml b/tests/manual/pointer/photosurface.qml
index 6601909a37..a2e8b2aede 100644
--- a/tests/manual/pointer/photosurface.qml
+++ b/tests/manual/pointer/photosurface.qml
@@ -110,7 +110,7 @@ Rectangle {
                     id: dragHandler
                     onActiveChanged: {
                         if (!active)
-                            anim.restart(velocity)
+                            anim.restart(point.velocity)
                     }
                 }
 
diff --git a/tests/manual/pointer/pinchDragFlingMPTA.qml b/tests/manual/pointer/pinchDragFlingMPTA.qml
index 25be48bb42..6446a17873 100644
--- a/tests/manual/pointer/pinchDragFlingMPTA.qml
+++ b/tests/manual/pointer/pinchDragFlingMPTA.qml
@@ -85,7 +85,7 @@ Rectangle {
                 objectName: "DragHandler"
                 target: container
                 acceptedModifiers: Qt.MetaModifier
-                onActiveChanged: if (!active) fling.restart(velocity)
+                onActiveChanged: if (!active) fling.restart(point.velocity)
             }
         }
         MomentumAnimation { id: fling; target: container }
diff --git a/tests/manual/pointer/singlePointHandlerProperties.qml b/tests/manual/pointer/singlePointHandlerProperties.qml
index f5a938e401..f91094ee9e 100644
--- a/tests/manual/pointer/singlePointHandlerProperties.qml
+++ b/tests/manual/pointer/singlePointHandlerProperties.qml
@@ -49,11 +49,11 @@ Rectangle {
 
     Item {
         id: crosshairs
-        x: dragHandler.pos.x - width / 2
-        y: dragHandler.pos.y - height / 2
+        x: dragHandler.point.position.x - width / 2
+        y: dragHandler.point.position.y - height / 2
         width: parent.width / 2; height: parent.height / 2
         visible: dragHandler.active
-        rotation: dragHandler.rotation
+        rotation: dragHandler.point.rotation
 
         Rectangle {
             color: "goldenrod"
@@ -69,7 +69,7 @@ Rectangle {
         }
         Rectangle {
             color: "goldenrod"
-            width: Math.max(2, 50 * dragHandler.pressure)
+            width: Math.max(2, 50 * dragHandler.point.pressure)
             height: width
             radius: width / 2
             anchors.centerIn: parent
@@ -82,8 +82,8 @@ Rectangle {
                 implicitHeight: label.implicitHeight
                 Text {
                     id: label
-                    text: 'id: ' + dragHandler.pointId.toString(16) + " uid: " + dragHandler.uniquePointId.numericId +
-                        '\npos: (' + dragHandler.pos.x.toFixed(2) + ', ' + dragHandler.pos.y.toFixed(2) + ')'
+                    text: 'id: ' + dragHandler.point.id.toString(16) + " uid: " + dragHandler.point.uniqueId.numericId +
+                        '\npos: (' + dragHandler.point.position.x.toFixed(2) + ', ' + dragHandler.point.position.y.toFixed(2) + ')'
                 }
             }
         }
@@ -91,8 +91,8 @@ Rectangle {
             color: "transparent"
             border.color: "white"
             antialiasing: true
-            width: dragHandler.ellipseDiameters.width
-            height: dragHandler.ellipseDiameters.height
+            width: dragHandler.point.ellipseDiameters.width
+            height: dragHandler.point.ellipseDiameters.height
             radius: Math.min(width / 2, height / 2)
             anchors.centerIn: parent
         }
@@ -100,11 +100,11 @@ Rectangle {
     Rectangle {
         id: velocityVector
         visible: width > 0
-        width: dragHandler.velocity.length() * 100
+        width: dragHandler.point.velocity.length() * 100
         height: 2
-        x: dragHandler.pos.x
-        y: dragHandler.pos.y
-        rotation: Math.atan2(dragHandler.velocity.y, dragHandler.velocity.x) * 180 / Math.PI
+        x: dragHandler.point.position.x
+        y: dragHandler.point.position.y
+        rotation: Math.atan2(dragHandler.point.velocity.y, dragHandler.point.velocity.x) * 180 / Math.PI
         transformOrigin: Item.BottomLeft
         antialiasing: true
 
@@ -150,13 +150,14 @@ Rectangle {
     DragHandler {
         id: dragHandler
         target: null
-        onGrabChanged: if (active) {
-            console.log("grabbed " + point.pointId + " @ " + sceneGrabPos)
-            grabbingLocationIndicator.createObject(root, {"x": sceneGrabPos.x, "y": sceneGrabPos.y - 16})
+        onGrabChanged: if (active) {    // 'point' is an implicit parameter referencing to a QQuickEventPoint instance
+            console.log("grabbed " + point.pointId + " @ " + point.sceneGrabPos)
+            grabbingLocationIndicator.createObject(root, {"x": point.sceneGrabPos.x, "y": point.sceneGrabPos.y - 16})
         }
-        onPressedButtonsChanged: {
-            if (pressedButtons)
-                mouseButtonIndicator.createObject(root, {"x": pressPos.x - 44, "y": pressPos.y - 64, "buttons": pressedButtons})
+        onPointChanged: {
+            // Here, 'point' is referring to the property of the DragHandler
+            if (point.pressedButtons)
+                mouseButtonIndicator.createObject(root, {"x": point.pressPosition.x - 44, "y": point.pressPosition.y - 64, "buttons": point.pressedButtons})
         }
     }
 }
diff --git a/tests/manual/pointer/tapHandler.qml b/tests/manual/pointer/tapHandler.qml
index 06070a02ff..5dac99a899 100644
--- a/tests/manual/pointer/tapHandler.qml
+++ b/tests/manual/pointer/tapHandler.qml
@@ -60,17 +60,13 @@ Item {
             gesturePolicy: (policyDragThresholdCB.checked ? TapHandler.DragThreshold :
                             policyWithinBoundsCB.checked ? TapHandler.WithinBounds :
                             TapHandler.ReleaseWithinBounds)
-            onPressedButtonsChanged: switch (pressedButtons) {
-                case Qt.MiddleButton: borderBlink.blinkColor = "orange"; break;
-                case Qt.RightButton: borderBlink.blinkColor = "magenta"; break;
-                default: borderBlink.blinkColor = "green"; break;
-            }
+
             onCanceled: {
-                console.log("canceled @ " + pos)
+                console.log("canceled @ " + point.position)
                 borderBlink.blinkColor = "red"
                 borderBlink.start()
             }
-            onTapped: {
+            onTapped: { // 'point' is an implicit parameter referencing to a QQuickEventPoint instance
                 console.log("tapped @ " + point.pos + " button(s) " + point.event.button + " tapCount " + tapCount)
                 if (tapCount > 1) {
                     tapCountLabel.text = tapCount
@@ -80,7 +76,7 @@ Item {
                 }
             }
             onLongPressed: longPressFeedback.createObject(rect,
-                {"x": pos.x, "y": pos.y,
+                {"x": point.position.x, "y": point.position.y,
                  "text": Math.round(handler.timeHeld).toFixed(3) + " sec",
                  "color": borderBlink.blinkColor})
         }
@@ -121,8 +117,8 @@ Item {
             color: "transparent"
             width: radius * 2
             height: radius * 2
-            x: handler.pressPos.x - radius
-            y: handler.pressPos.y - radius
+            x: handler.point.pressPosition.x - radius
+            y: handler.point.pressPosition.y - radius
             opacity: 0.25
         }
 
@@ -133,7 +129,13 @@ Item {
 
         SequentialAnimation {
             id: borderBlink
-            property color blinkColor: "blue"
+            property color blinkColor: (function(pbtns) {
+                switch (pbtns) {
+                case Qt.MiddleButton: return "orange";
+                case Qt.RightButton:  return "magenta";
+                default:              return "green";
+                }
+            })(handler.point.pressedButtons)
             loops: 3
             ScriptAction { script: rect.border.color = borderBlink.blinkColor }
             PauseAnimation { duration: 100 }