summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qevent.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-08-03 13:07:47 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-08-06 10:23:17 +0200
commitb9873b7dde4042445dbb5ff3c46cea96b2dea4aa (patch)
tree5ab5f47ccbf7a069503fcafca2e9b4930a221e85 /src/gui/kernel/qevent.h
parent3caeb0187dec592c78a3bde8d0284475e00e30d4 (diff)
Add QEventPoint::pressTimestamp() and priv setPressTimestamp()
There was no good reason for QEventPoint::pressTimestamp() to be missing. The case for QEventPoint::timestamp() is a bit dubious because it's redundant with QInputEvent::timestamp(); but for now, we keep m_timestamp, in anticipation that Qt Quick may need to keep copies of eventpoints between events, thus they need to avoid depending on their shorter-lived parent events too much. Change-Id: Iec38acfdfaa2afb3dc77d5cd1b95baa8d301c0fd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/gui/kernel/qevent.h')
-rw-r--r--src/gui/kernel/qevent.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 79a3ea3378..cfbaf8603e 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -154,6 +154,7 @@ public:
State state() const { return m_state; }
int id() const { return m_pointId; }
QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
+ ulong pressTimestamp() const { return m_pressTimestamp; }
qreal timeHeld() const { return (m_timestamp - m_pressTimestamp) / qreal(1000); }
qreal pressure() const { return m_pressure; }
qreal rotation() const { return m_rotation; }
@@ -177,7 +178,7 @@ protected:
QVector2D m_velocity;
QPointer<QObject> m_exclusiveGrabber;
QList<QPointer <QObject> > m_passiveGrabbers;
- ulong m_timestamp = 0;
+ ulong m_timestamp = 0; // redundant with m_parent->timestamp(), but keeps timeHeld() working in a saved copy
ulong m_pressTimestamp = 0;
QPointingDeviceUniqueId m_uniqueId;
int m_pointId = -1;