diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-12-13 21:28:53 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-12-16 23:07:34 +0100 |
| commit | 8813d9a22c7240a2c928f0ea8ce3370a8434da68 (patch) | |
| tree | 19685bddd1d601f8d01a5e8ff6d0ebea6638e8ae /src/quick/handlers/qquickdraghandler.cpp | |
| parent | 730cdc5043a8823dfcdce7d3b2035875f8f987c1 (diff) | |
Remove QQuickDragAxis::persistentValue and changed signal for now
It's better to avoid releasing with this new property until we are sure
we know its proper meaning. So far it seems that it should end up being
identical to the target-item property to be set, rather than e.g.
DragHandler.xAxis.persistentValue being the same as
DragHandler.persistentTranslation.x. That is, it's an item property's
current value, not a delta to adjust the value.
Reverts part of 7867a683fcb938939fb2837a26ac8e1941e3fe08
Pick-to: 6.5
Task-number: QTBUG-109373
Change-Id: Id3a78332194c714e75b69cbaef111229d75318e0
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickdraghandler.cpp')
| -rw-r--r-- | src/quick/handlers/qquickdraghandler.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/quick/handlers/qquickdraghandler.cpp b/src/quick/handlers/qquickdraghandler.cpp index 6b7c046c6c..3d807e0f2d 100644 --- a/src/quick/handlers/qquickdraghandler.cpp +++ b/src/quick/handlers/qquickdraghandler.cpp @@ -313,7 +313,6 @@ void QQuickDragHandler::setActiveTranslation(const QVector2D &trans) \qmlproperty real QtQuick::DragHandler::xAxis.maximum \qmlproperty bool QtQuick::DragHandler::xAxis.enabled \qmlproperty real QtQuick::DragHandler::xAxis.activeValue - \qmlproperty real QtQuick::DragHandler::xAxis.persistentValue \c xAxis controls the constraints for horizontal dragging. @@ -323,10 +322,9 @@ void QQuickDragHandler::setActiveTranslation(const QVector2D &trans) applied to the \l {PointerHandler::target} {target}. If \c enabled is true, horizontal dragging is allowed. \c activeValue is the same as \l {QtQuick::DragHandler::activeTranslation}{activeTranslation.x}. - \c persistentValue is the same as \l {QtQuick::DragHandler::persistentTranslation}{persistentTranslation.x}. - The \c activeValueChanged signal is emitted when \c activeValue (and therefore - \c persistentValue) changes, to provide the increment by which it changed. + The \c activeValueChanged signal is emitted when \c activeValue changes, to + provide the increment by which it changed. This is intended for incrementally adjusting one property via multiple handlers. */ @@ -336,7 +334,6 @@ void QQuickDragHandler::setActiveTranslation(const QVector2D &trans) \qmlproperty real QtQuick::DragHandler::yAxis.maximum \qmlproperty bool QtQuick::DragHandler::yAxis.enabled \qmlproperty real QtQuick::DragHandler::yAxis.activeValue - \qmlproperty real QtQuick::DragHandler::yAxis.persistentValue \c yAxis controls the constraints for vertical dragging. @@ -346,10 +343,9 @@ void QQuickDragHandler::setActiveTranslation(const QVector2D &trans) applied to the \l {PointerHandler::target} {target}. If \c enabled is true, vertical dragging is allowed. \c activeValue is the same as \l {QtQuick::DragHandler::activeTranslation}{activeTranslation.y}. - \c persistentValue is the same as \l {QtQuick::DragHandler::persistentTranslation}{persistentTranslation.y}. - The \c activeValueChanged signal is emitted when \c activeValue (and therefore - \c persistentValue) changes, to provide the increment by which it changed. + The \c activeValueChanged signal is emitted when \c activeValue changes, to + provide the increment by which it changed. This is intended for incrementally adjusting one property via multiple handlers: \snippet pointerHandlers/rotateViaWheelOrDrag.qml 0 |