Fixed some problems with the centroid in PinchHandler

The centroid was not always mapped to the correct coordinate system

In addition, the return value of startingCentroid() was not always
desirable, because its implementation calls sceneGrabPos(). We therefore
had to get the starting centroid by querying touchPointCentroid() whenever
the handler became active.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h
index 338b930373..5107a5c50b 100644
--- a/src/quick/handlers/qquickpinchhandler_p.h
+++ b/src/quick/handlers/qquickpinchhandler_p.h
@@ -155,6 +155,8 @@ private:
     qreal m_startScale;
     qreal m_startRotation;
     qreal m_activeRotation;
+    QPointF m_startCentroid;
+    qreal m_startDistance;
 
     QVector<PointData> m_startAngles;
     QMatrix4x4 m_startMatrix;