diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-20 08:59:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-20 08:59:13 (GMT) |
| commit | 97d57498481598d0d4babfa77f816761dead29b8 (patch) | |
| tree | 8709b1f70c8ad75e225acf476e827cf4e15b85f3 /src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | |
| parent | 0edbaca5e7b718bb9bbbeaccc9e322b525b4327e (diff) | |
| parent | 6037cb7f68fe0dec52f922d9e2f18c8e12a396cb (diff) | |
| download | Qt-97d57498481598d0d4babfa77f816761dead29b8.zip Qt-97d57498481598d0d4babfa77f816761dead29b8.tar.gz Qt-97d57498481598d0d4babfa77f816761dead29b8.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepincharea_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h index 5641e35..3264948 100644 --- a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h @@ -68,7 +68,10 @@ class QDeclarativePinchAreaPrivate : public QDeclarativeItemPrivate public: QDeclarativePinchAreaPrivate() : absorb(true), stealMouse(false), inPinch(false) - , pinchRejected(false), pinch(0), pinchStartDist(0) + , pinchRejected(false), pinchActivated(false) + , pinch(0), pinchStartDist(0), pinchStartScale(1.0) + , pinchLastScale(1.0), pinchStartRotation(0.0), pinchStartAngle(0.0) + , pinchLastAngle(0.0), pinchRotation(0.0) { } @@ -86,6 +89,7 @@ public: bool stealMouse : 1; bool inPinch : 1; bool pinchRejected : 1; + bool pinchActivated : 1; QDeclarativePinch *pinch; QPointF sceneStartPoint1; QPointF sceneStartPoint2; @@ -97,11 +101,13 @@ public: qreal pinchStartRotation; qreal pinchStartAngle; qreal pinchLastAngle; + qreal pinchRotation; QPointF sceneStartCenter; QPointF pinchStartCenter; QPointF sceneLastCenter; QPointF pinchStartPos; QList<QTouchEvent::TouchPoint> touchPoints; + int id1; }; QT_END_NAMESPACE |