diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-03-09 06:56:05 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2011-03-09 07:20:41 (GMT) |
commit | 4a0ce0775350cf2b10f44502dc86110684fc9fb5 (patch) | |
tree | 3ee8e5d058ea078eda6bf367423f4235fcc553da /src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | |
parent | bd24b4363239e23979695cb765918bdb1c865868 (diff) | |
download | Qt-4a0ce0775350cf2b10f44502dc86110684fc9fb5.zip Qt-4a0ce0775350cf2b10f44502dc86110684fc9fb5.tar.gz Qt-4a0ce0775350cf2b10f44502dc86110684fc9fb5.tar.bz2 |
The rotation reported by PinchArea should not be in the range -180..180
The rotation is the total rotation that has been applied since the
gesture started. This should not be normalized to -180 to 180. If you
contort your fingers such that you have rotated 420deg then that is
what should be reported.
Change-Id: I24ba3f105befc2b0d31f1933911a94a0152ffcb4
Task-number: QTBUG-17437
Reviewed-by: Bea Lam
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepincharea_p_p.h')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h index 5641e35..cd5cf2a 100644 --- a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h @@ -68,7 +68,9 @@ class QDeclarativePinchAreaPrivate : public QDeclarativeItemPrivate public: QDeclarativePinchAreaPrivate() : absorb(true), stealMouse(false), inPinch(false) - , pinchRejected(false), pinch(0), pinchStartDist(0) + , pinchRejected(false), pinch(0), pinchStartDist(0), pinchStartScale(1.0) + , pinchLastScale(1.0), pinchStartRotation(0.0), pinchStartAngle(0.0) + , pinchLastAngle(0.0), pinchRotation(0.0) { } @@ -97,6 +99,7 @@ public: qreal pinchStartRotation; qreal pinchStartAngle; qreal pinchLastAngle; + qreal pinchRotation; QPointF sceneStartCenter; QPointF pinchStartCenter; QPointF sceneLastCenter; |