1 files changed, 37 insertions, 53 deletions
diff --git a/src/quick/handlers/qquickdraghandler_p.h b/src/quick/handlers/qquickdraghandler_p.h
index 387a81eb43..e8f2ef5e1d 100644
--- a/src/quick/handlers/qquickdraghandler_p.h
+++ b/src/quick/handlers/qquickdraghandler_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QQUICKDRAGHANDLER_H
 #define QQUICKDRAGHANDLER_H
@@ -56,47 +20,70 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QQuickDragHandler : public QQuickMultiPointHandler
+using namespace Qt::StringLiterals;
+
+class Q_QUICK_EXPORT QQuickDragHandler : public QQuickMultiPointHandler
 {
     Q_OBJECT
     Q_PROPERTY(QQuickDragAxis * xAxis READ xAxis CONSTANT)
     Q_PROPERTY(QQuickDragAxis * yAxis READ yAxis CONSTANT)
+#if QT_DEPRECATED_SINCE(6, 2)
     Q_PROPERTY(QVector2D translation READ translation NOTIFY translationChanged)
+#endif
+    Q_PROPERTY(QVector2D activeTranslation READ activeTranslation NOTIFY translationChanged REVISION(6, 2))
+    Q_PROPERTY(QVector2D persistentTranslation READ persistentTranslation WRITE setPersistentTranslation NOTIFY translationChanged REVISION(6, 2))
+    Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged REVISION(2, 14))
+    QML_NAMED_ELEMENT(DragHandler)
+    QML_ADDED_IN_VERSION(2, 12)
 
 public:
+    enum SnapMode {
+        NoSnap = 0,
+        SnapAuto,
+        SnapIfPressedOutsideTarget,
+        SnapAlways
+    };
+    Q_ENUM(SnapMode)
+
     explicit QQuickDragHandler(QQuickItem *parent = nullptr);
 
-    void handlePointerEventImpl(QQuickPointerEvent *event) override;
+    void handlePointerEventImpl(QPointerEvent *event) override;
 
     QQuickDragAxis *xAxis() { return &m_xAxis; }
     QQuickDragAxis *yAxis() { return &m_yAxis; }
 
-    QVector2D translation() const { return m_translation; }
-    void setTranslation(const QVector2D &trans);
-
-    void enforceConstraints();
+#if QT_DEPRECATED_SINCE(6, 2)
+    QVector2D translation() const { return activeTranslation(); }
+#endif
+    QVector2D activeTranslation() const { return QVector2D(QPointF(m_xAxis.activeValue(), m_yAxis.activeValue())); }
+    void setActiveTranslation(const QVector2D &trans);
+    QVector2D persistentTranslation() const { return QVector2D(QPointF(m_xAxis.persistentValue(), m_yAxis.persistentValue())); }
+    void setPersistentTranslation(const QVector2D &trans);
+    QQuickDragHandler::SnapMode snapMode() const;
+    void setSnapMode(QQuickDragHandler::SnapMode mode);
 
 Q_SIGNALS:
-    void translationChanged();
+    void translationChanged(QVector2D delta);
+    Q_REVISION(2, 14) void snapModeChanged();
 
 protected:
+    bool wantsPointerEvent(QPointerEvent *event) override;
     void onActiveChanged() override;
-    void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabTransition transition, QQuickEventPoint *point) override;
+    void onGrabChanged(QQuickPointerHandler *grabber, QPointingDevice::GrabTransition transition, QPointerEvent *event, QEventPoint &point) override;
 
 private:
     void ungrab();
     void enforceAxisConstraints(QPointF *localPos);
-    bool targetContainsCentroid();
     QPointF targetCentroidPosition();
 
 private:
     QPointF m_pressTargetPos;   // We must also store the local targetPos, because we cannot deduce
                                 // the press target pos from the scene pos in case there was e.g a
                                 // flick in one of the ancestors during the drag.
-    QVector2D m_translation;
 
-    QQuickDragAxis m_xAxis;
-    QQuickDragAxis m_yAxis;
+    QQuickDragAxis m_xAxis = {this, u"x"_s};
+    QQuickDragAxis m_yAxis = {this, u"y"_s};
+    QQuickDragHandler::SnapMode m_snapMode = SnapAuto;
     bool m_pressedInsideTarget = false;
 
     friend class QQuickDragAxis;
@@ -104,7 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDragHandler)
-QML_DECLARE_TYPE(QQuickDragAxis)
-
 #endif // QQUICKDRAGHANDLER_H