diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
commit | bbc52bcbb6391c4925df26672eb1f26040c6f67c (patch) | |
tree | 14b8580e21aecc5b08a35f69ac55e7fbc3aef3ba /src/quick/handlers/qquickpinchhandler.cpp | |
parent | 5ff4facd8efc41b30b5ffa5abb6a12406685ca0b (diff) | |
parent | cc0829cbf300e56360e3d61efe4dfd20efcabb1c (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6e9b5fbf50da24cae9e555723a5f1d8365d4a2f3
Diffstat (limited to 'src/quick/handlers/qquickpinchhandler.cpp')
-rw-r--r-- | src/quick/handlers/qquickpinchhandler.cpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp index 24f9885534..00376944c7 100644 --- a/src/quick/handlers/qquickpinchhandler.cpp +++ b/src/quick/handlers/qquickpinchhandler.cpp @@ -152,29 +152,6 @@ void QQuickPinchHandler::setMaximumRotation(qreal maximumRotation) } /*! - \qmlproperty real QtQuick::PinchHandler::pinchOrigin - - The point to be held in place, around which the \l target is scaled and - rotated. - - \value FirstPoint - the first touch point, wherever the first finger is pressed - \value PinchCenter - the centroid between all the touch points at the time when the - PinchHandler becomes \l active - \value TargetCenter - the center of the \l target -*/ -void QQuickPinchHandler::setPinchOrigin(QQuickPinchHandler::PinchOrigin pinchOrigin) -{ - if (m_pinchOrigin == pinchOrigin) - return; - - m_pinchOrigin = pinchOrigin; - emit pinchOriginChanged(); -} - -/*! \qmlproperty real QtQuick::PinchHandler::minimumX The minimum acceptable x coordinate of the centroid @@ -445,7 +422,6 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event) if (!active()) return; } - // TODO check m_pinchOrigin: right now it acts like it's set to PinchCenter // avoid mapping the minima and maxima, as they might have unmappable values // such as -inf/+inf. Because of this we perform the bounding to min/max in local coords. @@ -523,8 +499,7 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event) \qmlproperty QQuickHandlerPoint QtQuick::PinchHandler::centroid A point exactly in the middle of the currently-pressed touch points. - If \l pinchOrigin is set to \c PinchCenter, the \l target will be rotated - around this point. + The \l target will be rotated around this point. */ /*! |