diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-07-08 22:47:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-09 12:47:21 +0000 |
| commit | 49aae3906e1424cf93347a5f5c63927154955b9c (patch) | |
| tree | 64c97d9254d914c34b0a9192136c126fe6bed8e5 | |
| parent | f8b414f23ee085d9fa1089a98da6a117bc5e50c5 (diff) | |
doc: Remove bogus PinchHandler.minimumTouchPoints prop; improve actual
PinchHandler.minimumTouchPoints was probably just an early idea for the
name, because MultiPointTouchArea has it. Anyway it's now honoring the
inherited minimum/maximumPointCount properties from MultiPointHandler.
Change-Id: I6408da9dfe1d31a38da2777efa2c5d79ad17390f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit a04d98787dc5c816569a6eecce695a8d80257c05)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/handlers/qquickpinchhandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp index dc1a9a92f9..186ee06b28 100644 --- a/src/quick/handlers/qquickpinchhandler.cpp +++ b/src/quick/handlers/qquickpinchhandler.cpp @@ -84,7 +84,14 @@ Q_LOGGING_CATEGORY(lcPinchHandler, "qt.quick.handler.pinch") \image touchpoints-pinchhandler.png - \sa PinchArea + \note The pinch begins when the number of fingers pressed is between + \l {MultiPointHandler::minimumPointCount}{minimumPointCount} and + \l {MultiPointHandler::maximumPointCount}{maximumPointCount}, inclusive. + Until then, PinchHandler tracks the positions of any pressed fingers, + but if it's a disallowed number, it does not scale or rotate + its \l target, and the \l active property remains \c false. + + \sa PinchArea, QPointerEvent::pointCount() */ QQuickPinchHandler::QQuickPinchHandler(QQuickItem *parent) @@ -248,19 +255,12 @@ bool QQuickPinchHandler::wantsPointerEvent(QQuickPointerEvent *event) */ /*! - \qmlproperty int QtQuick::PinchHandler::minimumTouchPoints - - The pinch begins when this number of fingers are pressed. - Until then, PinchHandler tracks the positions of any pressed fingers, - but if it's an insufficient number, it does not scale or rotate - its \l target, and the \l active property will remain false. -*/ - -/*! \qmlproperty bool QtQuick::PinchHandler::active - This property is true when all the constraints (epecially \l minimumTouchPoints) - are satisfied and the \l target, if any, is being manipulated. + This property is \c true when all the constraints (epecially + \l {MultiPointHandler::minimumPointCount}{minimumPointCount} and + \l {MultiPointHandler::maximumPointCount}{maximumPointCount}) are satisfied + and the \l target, if any, is being manipulated. */ void QQuickPinchHandler::onActiveChanged() |