diff options
| author | Andras Becsi <andras.becsi@nokia.com> | 2011-11-29 15:24:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-20 13:36:16 +0100 |
| commit | a231d3c67acca174da7066b3457f4e31a5c8e506 (patch) | |
| tree | 315b6c120170f3d10be8cfa1ee83cd94122f4321 /src/quick/items/qquickflickable_p_p.h | |
| parent | 0332e605f916ff67ce579172e857e457e8ea3e41 (diff) | |
Use input event timestamps in QQuickFlickable if available.
Change-Id: If89ad205dec9ffdba4ca196cdc1a2e5fd9258260
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 8ceea6162f..69fad683df 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -183,10 +183,11 @@ public: bool interactive : 1; bool calcVelocity : 1; bool pixelAligned : 1; - QElapsedTimer lastPosTime; + QElapsedTimer timer; + qint64 lastPosTime; + qint64 lastPressTime; QPointF lastPos; QPointF pressPos; - QElapsedTimer pressTime; qreal deceleration; qreal maxVelocity; QElapsedTimer velocityTime; @@ -215,6 +216,8 @@ public: void handleMouseMoveEvent(QMouseEvent *); void handleMouseReleaseEvent(QMouseEvent *); + qint64 computeCurrentTime(QInputEvent *event); + // flickableData property static void data_append(QDeclarativeListProperty<QObject> *, QObject *); static int data_count(QDeclarativeListProperty<QObject> *); |