diff options
Diffstat (limited to 'src/core/render_widget_host_view_qt_delegate_client.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt_delegate_client.h | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/src/core/render_widget_host_view_qt_delegate_client.h b/src/core/render_widget_host_view_qt_delegate_client.h index c338df95e..57354f549 100644 --- a/src/core/render_widget_host_view_qt_delegate_client.h +++ b/src/core/render_widget_host_view_qt_delegate_client.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine 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) 2020 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 // // W A R N I N G @@ -53,6 +17,7 @@ #include "compositor/compositor.h" +#include <QMap> #include <QtGui/QCursor> #include <QtGui/QTouchEvent> @@ -81,7 +46,7 @@ struct MultipleMouseClickHelper ulong lastPressTimestamp = 0; }; -class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateClient +class Q_WEBENGINECORE_EXPORT RenderWidgetHostViewQtDelegateClient { public: RenderWidgetHostViewQtDelegateClient(RenderWidgetHostViewQt *rwhv); @@ -131,7 +96,6 @@ private: RenderWidgetHostViewQt *m_rwhv; // Mouse - bool m_imeHasHiddenTextCapability; uint m_mouseButtonPressed = 0; QPoint m_previousMousePosition; MultipleMouseClickHelper m_clickHelper; @@ -140,9 +104,13 @@ private: std::string m_editCommand; // Touch - QList<QTouchEvent::TouchPoint> m_previousTouchPoints; + typedef QPair<int, QTouchEvent::TouchPoint> TouchPoint; + QList<TouchPoint> mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &input); + QMap<int, int> m_touchIdMapping; + QList<TouchPoint> m_previousTouchPoints; bool m_touchMotionStarted = false; bool m_sendMotionActionDown = false; + int64_t m_eventsToNowDelta = 0; // delta for first touch in microseconds // IME bool m_receivedEmptyImeEvent = false; |