diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-04-01 22:47:12 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-04-15 07:48:02 +0000 |
| commit | e6e63e749088d3a6057bcb18f0f241ab1eb603f6 (patch) | |
| tree | 24187c8f5aac1cf19d6561deda580ec125bf0a56 /src/quick/handlers/qquickmultipointhandler_p_p.h | |
| parent | 48f9dbf06a8fc8530edeb74ff93282b7cbb570d2 (diff) | |
QQuickMultiPointHandler::moveTarget(): work with interceptors
As with WheelHandler, DragHandler also needs to allow the target movements
to be constrained with interceptors like BoundaryRule.
Also do a null pointer check in moveTarget(): we haven't needed it before, but
we are becoming more open to subclassing, so need to prevent user foot-shooting.
Change-Id: I6b39b6dd2ca8245c56ecb3812e6de9624b36fa50
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickmultipointhandler_p_p.h')
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler_p_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler_p_p.h b/src/quick/handlers/qquickmultipointhandler_p_p.h index d6b43fe59e..406e4a1fdf 100644 --- a/src/quick/handlers/qquickmultipointhandler_p_p.h +++ b/src/quick/handlers/qquickmultipointhandler_p_p.h @@ -67,10 +67,15 @@ public: QQuickMultiPointHandlerPrivate(int minPointCount, int maxPointCount); + QMetaProperty &xMetaProperty() const; + QMetaProperty &yMetaProperty() const; + QVector<QQuickHandlerPoint> currentPoints; QQuickHandlerPoint centroid; int minimumPointCount; int maximumPointCount; + mutable QMetaProperty xProperty; + mutable QMetaProperty yProperty; }; QT_END_NAMESPACE |