diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-02-07 13:24:49 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-02-16 12:45:47 +0000 |
commit | af21677f473bce12ee7c725b1151ae794384ae76 (patch) | |
tree | 78a5bd403e25538cd59096005b7cd90cb79f8068 /src/quick/items/qquickevents_p_p.h | |
parent | 4e7041c65216ada4f5fb604a9df840152ba60317 (diff) |
QQuickWindow: remove sendFilteredTouchEvent
The functionality is now completely assimilated into
sendFilteredPointerEvent.
Flickable can now steal the touch grab from a TapHandler child,
for example: the TapHandler grabbed the eventpoint, whereas
QQuickFlickable::childMouseEventFilter() was given a synthetic
mouse event derived from the touchpoint which the eventpoint
represented, and we fully follow through the consequences of that.
If an Item filters a press event, avoid doing normal delivery
to that same Item again.
Change-Id: Icd9c88ab752f2b728f7d612504013c6dc72ff9fe
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
-rw-r--r-- | src/quick/items/qquickevents_p_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 5386eacad9..d042f318e9 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -400,6 +400,7 @@ public: // helpers for C++ only (during event delivery) virtual const QQuickPointerTabletEvent *asPointerTabletEvent() const { return nullptr; } bool isValid() const { return m_event != nullptr; } virtual bool allPointsAccepted() const = 0; + virtual bool allUpdatedPointsAccepted() const = 0; virtual bool allPointsGrabbed() const = 0; bool isAccepted() { return m_event->isAccepted(); } void setAccepted(bool accepted) { m_event->setAccepted(accepted); } @@ -439,6 +440,7 @@ public: QQuickEventPoint *point(int i) const override; QQuickEventPoint *pointById(quint64 pointId) const override; bool allPointsAccepted() const override; + bool allUpdatedPointsAccepted() const override; bool allPointsGrabbed() const override; QVector<QObject *> grabbers() const override; void clearGrabbers() const override; @@ -472,6 +474,7 @@ public: QQuickEventPoint *pointById(quint64 pointId) const override; const QTouchEvent::TouchPoint *touchPointById(int pointId) const; bool allPointsAccepted() const override; + bool allUpdatedPointsAccepted() const override; bool allPointsGrabbed() const override; QVector<QObject *> grabbers() const override; void clearGrabbers() const override; |