diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-07-15 15:15:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-23 17:23:19 +0000 |
| commit | 16e299fbb106f7d2de954afb1b921a80f4cd3e67 (patch) | |
| tree | 7515224b5551565a776b6cf71492dccce28b3dfe /src/quick/items/qquickevents_p_p.h | |
| parent | ba3fb9f8ee4ba735182713272c3abdc01d1de763 (diff) | |
Move mouseGrabberItem into the QQuickPointerEvent
The idea is to manage the "grab" for mouse and touch points inside the
pointer event, instead of having awkward extra state in the window.
Change-Id: I4011c66c163159b0315bf8e284d8e1c7c460f108
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index f2e06b69df..3cec7c782a 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -253,6 +253,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject Q_PROPERTY(quint64 pointId READ pointId) Q_PROPERTY(qreal timeHeld READ timeHeld) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) + Q_PROPERTY(QQuickItem *grabber READ grabber WRITE setGrabber) public: QQuickEventPoint(QQuickPointerEvent *parent); @@ -280,10 +281,13 @@ public: qreal timeHeld() const { return (m_timestamp - m_pressTimestamp) / 1000.0; } bool isAccepted() const { return m_accept; } void setAccepted(bool accepted = true) { m_accept = accepted; } + QQuickItem *grabber() const { return m_grabber; } + void setGrabber(QQuickItem *grabber) { m_grabber = grabber; } private: QPointF m_scenePos; quint64 m_pointId; + QQuickItem *m_grabber; ulong m_timestamp; ulong m_pressTimestamp; Qt::TouchPointState m_state; |