diff options
Diffstat (limited to 'src/quick/handlers/qquicksinglepointhandler.cpp')
| -rw-r--r-- | src/quick/handlers/qquicksinglepointhandler.cpp | 206 |
1 files changed, 111 insertions, 95 deletions
diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp index 81859f6c80..52e3f8ce5f 100644 --- a/src/quick/handlers/qquicksinglepointhandler.cpp +++ b/src/quick/handlers/qquicksinglepointhandler.cpp @@ -1,46 +1,12 @@ -/**************************************************************************** -** -** 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 #include "qquicksinglepointhandler_p.h" +#include "qquicksinglepointhandler_p_p.h" + +#include <private/qquickdeliveryagent_p.h> QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(DBG_TOUCH_TARGET) /*! \qmltype SinglePointHandler @@ -59,43 +25,60 @@ Q_DECLARE_LOGGING_CATEGORY(DBG_TOUCH_TARGET) */ QQuickSinglePointHandler::QQuickSinglePointHandler(QQuickItem *parent) - : QQuickPointerDeviceHandler(parent) + : QQuickPointerDeviceHandler(*(new QQuickSinglePointHandlerPrivate), parent) +{ +} + +QQuickSinglePointHandler::QQuickSinglePointHandler(QQuickSinglePointHandlerPrivate &dd, QQuickItem *parent) + : QQuickPointerDeviceHandler(dd, parent) { } -bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) +bool QQuickSinglePointHandler::wantsPointerEvent(QPointerEvent *event) { + Q_D(QQuickSinglePointHandler); if (!QQuickPointerDeviceHandler::wantsPointerEvent(event)) return false; - if (m_pointInfo.m_id) { + if (d->pointInfo.id() != -1) { // We already know which one we want, so check whether it's there. // It's expected to be an update or a release. // If we no longer want it, cancel the grab. int candidatePointCount = 0; bool missing = true; - QQuickEventPoint *point = nullptr; - int c = event->pointCount(); - for (int i = 0; i < c; ++i) { - QQuickEventPoint *p = event->point(i); - const bool found = (p->pointId() == m_pointInfo.m_id); + QEventPoint *point = nullptr; + for (int i = 0; i < event->pointCount(); ++i) { + auto &p = event->point(i); + const bool found = (p.id() == d->pointInfo.id()); if (found) missing = false; - if (wantsEventPoint(p)) { + if (wantsEventPoint(event, p)) { ++candidatePointCount; if (found) - point = p; + point = &p; + } + } + if (missing) { + // Received a stray touch begin event => reset and start over. + if (event->type() == QEvent::TouchBegin && event->points().count() == 1) { + const QEventPoint &point = event->point(0); + qCDebug(lcTouchTarget) << this << "pointId" << Qt::hex << point.id() + << "was received as a stray TouchBegin event. Canceling existing gesture" + " and starting over."; + d->pointInfo.reset(event, point); + return true; + } else { + qCWarning(lcTouchTarget) << this << "pointId" << Qt::hex << d->pointInfo.id() + << "is missing from current event, but was neither canceled nor released." + " Ignoring:" << event->type(); } } - if (missing) - qCWarning(DBG_TOUCH_TARGET) << this << "pointId" << hex << m_pointInfo.m_id - << "is missing from current event, but was neither canceled nor released"; if (point) { - if (candidatePointCount == 1 || (candidatePointCount > 1 && m_ignoreAdditionalPoints)) { + if (candidatePointCount == 1 || (candidatePointCount > 1 && d->ignoreAdditionalPoints)) { point->setAccepted(); return true; } else { - point->cancelAllGrabs(this); + cancelAllGrabs(event, *point); } } else { return false; @@ -103,94 +86,127 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) } else { // We have not yet chosen a point; choose the first one for which wantsEventPoint() returns true. int candidatePointCount = 0; - int c = event->pointCount(); - QQuickEventPoint *chosen = nullptr; - for (int i = 0; i < c && !chosen; ++i) { - QQuickEventPoint *p = event->point(i); - if (!p->exclusiveGrabber() && wantsEventPoint(p)) { - if (!chosen) - chosen = p; + QEventPoint *chosen = nullptr; + for (int i = 0; i < event->pointCount(); ++i) { + auto &p = event->point(i); + if (!event->exclusiveGrabber(p) && wantsEventPoint(event, p)) { ++candidatePointCount; + if (!chosen) { + chosen = &p; + break; + } } } if (chosen && candidatePointCount == 1) { - setPointId(chosen->pointId()); + setPointId(chosen->id()); chosen->setAccepted(); } } - return m_pointInfo.m_id; + return d->pointInfo.id() != -1; } -void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) +void QQuickSinglePointHandler::handlePointerEventImpl(QPointerEvent *event) { + Q_D(QQuickSinglePointHandler); QQuickPointerDeviceHandler::handlePointerEventImpl(event); - QQuickEventPoint *currentPoint = event->pointById(m_pointInfo.m_id); + QEventPoint *currentPoint = const_cast<QEventPoint *>(event->pointById(d->pointInfo.id())); Q_ASSERT(currentPoint); - m_pointInfo.reset(currentPoint); - handleEventPoint(currentPoint); - if (currentPoint->state() == QQuickEventPoint::Released && (event->buttons() & acceptedButtons()) == Qt::NoButton) { - setExclusiveGrab(currentPoint, false); - reset(); - } + d->pointInfo.reset(event, *currentPoint); + handleEventPoint(event, *currentPoint); emit pointChanged(); } -void QQuickSinglePointHandler::onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabTransition transition, QQuickEventPoint *point) +void QQuickSinglePointHandler::handleEventPoint(QPointerEvent *event, QEventPoint &point) +{ + if (point.state() == QEventPoint::Released) { + // If it's a mouse or tablet event, with buttons, + // do not deactivate unless all acceptable buttons are released. + if (event->isSinglePointEvent()) { + const Qt::MouseButtons releasedButtons = static_cast<QSinglePointEvent *>(event)->buttons(); + if ((releasedButtons & acceptedButtons()) != Qt::NoButton) + return; + } + + // Deactivate this handler on release + setExclusiveGrab(event, point, false); + d_func()->reset(); + } +} + +void QQuickSinglePointHandler::onGrabChanged(QQuickPointerHandler *grabber, QPointingDevice::GrabTransition transition, QPointerEvent *event, QEventPoint &point) { + Q_D(QQuickSinglePointHandler); if (grabber != this) return; switch (transition) { - case QQuickEventPoint::GrabExclusive: - m_pointInfo.m_sceneGrabPosition = point->sceneGrabPosition(); + case QPointingDevice::GrabExclusive: + d->pointInfo.m_sceneGrabPosition = point.sceneGrabPosition(); setActive(true); - QQuickPointerHandler::onGrabChanged(grabber, transition, point); + QQuickPointerHandler::onGrabChanged(grabber, transition, event, point); break; - case QQuickEventPoint::GrabPassive: - m_pointInfo.m_sceneGrabPosition = point->sceneGrabPosition(); - QQuickPointerHandler::onGrabChanged(grabber, transition, point); + case QPointingDevice::GrabPassive: + d->pointInfo.m_sceneGrabPosition = point.sceneGrabPosition(); + QQuickPointerHandler::onGrabChanged(grabber, transition, event, point); break; - case QQuickEventPoint::OverrideGrabPassive: + case QPointingDevice::OverrideGrabPassive: return; // don't emit - case QQuickEventPoint::UngrabPassive: - case QQuickEventPoint::UngrabExclusive: - case QQuickEventPoint::CancelGrabPassive: - case QQuickEventPoint::CancelGrabExclusive: + case QPointingDevice::UngrabPassive: + case QPointingDevice::UngrabExclusive: + case QPointingDevice::CancelGrabPassive: + case QPointingDevice::CancelGrabExclusive: // the grab is lost or relinquished, so the point is no longer relevant - QQuickPointerHandler::onGrabChanged(grabber, transition, point); - reset(); + QQuickPointerHandler::onGrabChanged(grabber, transition, event, point); + d->reset(); break; } } void QQuickSinglePointHandler::setIgnoreAdditionalPoints(bool v) { - m_ignoreAdditionalPoints = v; + Q_D(QQuickSinglePointHandler); + d->ignoreAdditionalPoints = v; } -void QQuickSinglePointHandler::moveTarget(QPointF pos, QQuickEventPoint *point) +void QQuickSinglePointHandler::moveTarget(QPointF pos, QEventPoint &point) { + Q_D(QQuickSinglePointHandler); target()->setPosition(pos); - m_pointInfo.m_scenePosition = point->scenePosition(); - m_pointInfo.m_position = target()->mapFromScene(m_pointInfo.m_scenePosition); + d->pointInfo.m_scenePosition = point.scenePosition(); + d->pointInfo.m_position = target()->mapFromScene(d->pointInfo.m_scenePosition); } void QQuickSinglePointHandler::setPointId(int id) { - m_pointInfo.m_id = id; + Q_D(QQuickSinglePointHandler); + d->pointInfo.m_id = id; } -void QQuickSinglePointHandler::reset() +QQuickHandlerPoint QQuickSinglePointHandler::point() const { - setActive(false); - m_pointInfo.reset(); + Q_D(const QQuickSinglePointHandler); + return d->pointInfo; } /*! \readonly - \qmlproperty HandlerPoint QtQuick::SinglePointHandler::point + \qmlproperty handlerPoint QtQuick::SinglePointHandler::point - The event point currently being handled. When no point is currently being + The \l eventPoint currently being handled. When no point is currently being handled, this object is reset to default values (all coordinates are 0). */ +QQuickSinglePointHandlerPrivate::QQuickSinglePointHandlerPrivate() + : QQuickPointerDeviceHandlerPrivate() +{ +} + +void QQuickSinglePointHandlerPrivate::reset() +{ + Q_Q(QQuickSinglePointHandler); + q->setActive(false); + pointInfo.reset(); +} + QT_END_NAMESPACE + +#include "moc_qquicksinglepointhandler_p.cpp" |