diff options
Diffstat (limited to 'src/quick/handlers/qquickpointerhandler_p_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpointerhandler_p_p.h | 48 |
1 files changed, 9 insertions, 39 deletions
diff --git a/src/quick/handlers/qquickpointerhandler_p_p.h b/src/quick/handlers/qquickpointerhandler_p_p.h index 99120523d8..7072222773 100644 --- a/src/quick/handlers/qquickpointerhandler_p_p.h +++ b/src/quick/handlers/qquickpointerhandler_p_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 QQUICKPOINTERHANDLER_P_H #define QQUICKPOINTERHANDLER_P_H @@ -53,12 +17,13 @@ #include "qevent.h" +#include <QtCore/private/qobject_p.h> #include <QtQuick/private/qquickevents_p_p.h> #include <QtQuick/private/qquickpointerhandler_p.h> QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QQuickPointerHandlerPrivate : public QObjectPrivate +class Q_QUICK_EXPORT QQuickPointerHandlerPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickPointerHandler) @@ -74,11 +39,15 @@ public: bool dragOverThreshold(QVector2D delta) const; bool dragOverThreshold(const QEventPoint &point) const; + virtual void onParentChanged(QQuickItem * /*oldParent*/, QQuickItem * /*newParent*/) {} + virtual void onEnabledChanged() {} + static QVector<QObject *> &deviceDeliveryTargets(const QInputDevice *device); QPointerEvent *currentEvent = nullptr; QQuickItem *target = nullptr; qreal m_margin = 0; + quint64 lastEventTime = 0; qint16 dragThreshold = -1; // -1 means use the platform default uint8_t grabPermissions : 8; Qt::CursorShape cursorShape : 6; @@ -88,6 +57,7 @@ public: bool hadKeepMouseGrab : 1; // some handlers override target()->setKeepMouseGrab(); this remembers previous state bool hadKeepTouchGrab : 1; // some handlers override target()->setKeepTouchGrab(); this remembers previous state bool cursorSet : 1; + bool cursorDirty : 1; }; QT_END_NAMESPACE |