diff options
Diffstat (limited to 'src/quick/handlers/qquicktaphandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquicktaphandler_p.h | 91 |
1 files changed, 39 insertions, 52 deletions
diff --git a/src/quick/handlers/qquicktaphandler_p.h b/src/quick/handlers/qquicktaphandler_p.h index d75547eee2..a9908ebabd 100644 --- a/src/quick/handlers/qquicktaphandler_p.h +++ b/src/quick/handlers/qquicktaphandler_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 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 QQUICKTAPHANDLER_H #define QQUICKTAPHANDLER_H @@ -51,21 +15,24 @@ // We mean it. // -#include "qquickitem.h" -#include "qevent.h" -#include "qquicksinglepointhandler_p.h" #include <QtCore/qbasictimer.h> +#include <QtCore/qelapsedtimer.h> +#include <QtGui/qevent.h> +#include <QtQuick/qquickitem.h> + +#include "qquicksinglepointhandler_p.h" QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QQuickTapHandler : public QQuickSinglePointHandler +class Q_QUICK_EXPORT QQuickTapHandler : public QQuickSinglePointHandler { Q_OBJECT Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged) Q_PROPERTY(int tapCount READ tapCount NOTIFY tapCountChanged) Q_PROPERTY(qreal timeHeld READ timeHeld NOTIFY timeHeldChanged) - Q_PROPERTY(qreal longPressThreshold READ longPressThreshold WRITE setLongPressThreshold NOTIFY longPressThresholdChanged) + Q_PROPERTY(qreal longPressThreshold READ longPressThreshold WRITE setLongPressThreshold NOTIFY longPressThresholdChanged RESET resetLongPressThreshold) Q_PROPERTY(GesturePolicy gesturePolicy READ gesturePolicy WRITE setGesturePolicy NOTIFY gesturePolicyChanged) + Q_PROPERTY(QQuickTapHandler::ExclusiveSignals exclusiveSignals READ exclusiveSignals WRITE setExclusiveSignals NOTIFY exclusiveSignalsChanged REVISION(6, 5)) QML_NAMED_ELEMENT(TapHandler) QML_ADDED_IN_VERSION(2, 12) @@ -74,10 +41,19 @@ public: enum GesturePolicy { DragThreshold, WithinBounds, - ReleaseWithinBounds + ReleaseWithinBounds, + DragWithinBounds }; Q_ENUM(GesturePolicy) + enum ExclusiveSignal { + NotExclusive = 0, + SingleTap = 1 << 0, + DoubleTap = 1 << 1 + }; + Q_DECLARE_FLAGS(ExclusiveSignals, ExclusiveSignal) + Q_FLAG(ExclusiveSignals) + explicit QQuickTapHandler(QQuickItem *parent = nullptr); bool isPressed() const { return m_pressed; } @@ -87,19 +63,25 @@ public: qreal longPressThreshold() const; void setLongPressThreshold(qreal longPressThreshold); + void resetLongPressThreshold(); GesturePolicy gesturePolicy() const { return m_gesturePolicy; } void setGesturePolicy(GesturePolicy gesturePolicy); + QQuickTapHandler::ExclusiveSignals exclusiveSignals() const { return m_exclusiveSignals; } + void setExclusiveSignals(QQuickTapHandler::ExclusiveSignals newexclusiveSignals); + Q_SIGNALS: void pressedChanged(); void tapCountChanged(); void timeHeldChanged(); void longPressThresholdChanged(); void gesturePolicyChanged(); - void tapped(QEventPoint eventPoint); - void singleTapped(QEventPoint eventPoint); - void doubleTapped(QEventPoint eventPoint); + Q_REVISION(6, 5) void exclusiveSignalsChanged(); + // the second argument (Qt::MouseButton) was added in 6.2: avoid name clashes with IDs by not naming it for now + void tapped(QEventPoint eventPoint, Qt::MouseButton /* button */); + void singleTapped(QEventPoint eventPoint, Qt::MouseButton /* button */); + void doubleTapped(QEventPoint eventPoint, Qt::MouseButton /* button */); void longPressed(); protected: @@ -111,27 +93,32 @@ protected: private: void setPressed(bool press, bool cancel, QPointerEvent *event, QEventPoint &point); - int longPressThresholdMilliseconds() const; void connectPreRenderSignal(bool conn = true); void updateTimeHeld(); private: QPointF m_lastTapPos; - qreal m_lastTapTimestamp = 0; + quint64 m_lastTapTimestamp = 0; QElapsedTimer m_holdTimer; QBasicTimer m_longPressTimer; + QBasicTimer m_doubleTapTimer; + QEventPoint m_singleTapReleasedPoint; + QMetaObject::Connection m_preRenderSignalConnection; + Qt::MouseButton m_singleTapReleasedButton; int m_tapCount = 0; int m_longPressThreshold = -1; GesturePolicy m_gesturePolicy = GesturePolicy::DragThreshold; + ExclusiveSignals m_exclusiveSignals = NotExclusive; bool m_pressed = false; + bool m_longPressed = false; - static qreal m_multiTapInterval; + static quint64 m_multiTapInterval; static int m_mouseMultiClickDistanceSquared; static int m_touchMultiTapDistanceSquared; }; -QT_END_NAMESPACE +Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickTapHandler::ExclusiveSignals) -QML_DECLARE_TYPE(QQuickTapHandler) +QT_END_NAMESPACE #endif // QQUICKTAPHANDLER_H |