diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-07 17:10:43 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-08 13:11:23 +0000 |
commit | 3b3c8103496f61ebc4b72e73035a4d43fcdd03b0 (patch) | |
tree | 76bcd2a06da851b94984a50a4e137155bfac682c /src/quick/items/qquickevents_p_p.h | |
parent | 54bb88bc99a0ea3966b6bde2ba06e4ece237a32c (diff) |
PointerHandlers: fix some grab notification and signal order problems
The singlePointHandlerProperties manual test showed how this was broken
in a couple of ways after 8c659c6c723e4f5f97f46a4555a4765e85c26f1d :
- When QQuickPointerTouchEvent::reset() is swapping one point instance
for another, and consequently transferring the grabbers from one to
another, it should not cause onGrabChanged to occur. Every point
update was triggering DragHandler.onGrabChanged.
- The order of signal emission is important so that sceneGrabPos
will be correct in onGrabChanged.
Change-Id: I62a302d6e54126ae10834b6d622e82aa0e434bab
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index c4200ac550..2eebf131bc 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -370,6 +370,8 @@ private: QSizeF m_ellipseDiameters; QPointingDeviceUniqueId m_uniqueId; + friend class QQuickPointerTouchEvent; + Q_DISABLE_COPY(QQuickEventTouchPoint) }; |