From 153dcfbbba822390ccb7109499088cc954100a26 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 14 Sep 2020 16:13:16 +0200 Subject: Rename is[Begin|Update|End]Event, reimplement in QWheelEvent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These states correspond well with ScrollPhase, and this abstraction makes it possible to handle wheel events the same way as mouse events in Qt Quick: on "begin" we deliver to all Items and Handlers until all points (the only point) are accepted; on "update" and "end" we deliver only to the exclusive grabber, if there is one, and to any passive grabbers. Change-Id: I702dbd4f2c1bf5962eb3dbb9e4b725300a00a887 Reviewed-by: Tor Arne Vestbø Reviewed-by: Paul Wicking Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qevent.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/gui/kernel/qevent.h') diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index ab87fc3c4b..190959cb16 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -210,9 +210,9 @@ public: const QList &points() const { return m_points; } QEventPoint *pointById(int id); bool allPointsGrabbed() const; - virtual bool isPressEvent() const { return false; } + virtual bool isBeginEvent() const { return false; } virtual bool isUpdateEvent() const { return false; } - virtual bool isReleaseEvent() const { return false; } + virtual bool isEndEvent() const { return false; } bool allPointsAccepted() const; QObject *exclusiveGrabber(const QEventPoint &point) const; void setExclusiveGrabber(const QEventPoint &point, QObject *exclusiveGrabber); @@ -243,9 +243,9 @@ public: inline QPointF globalPosition() const { Q_ASSERT(!m_points.isEmpty()); return m_points.first().globalPosition(); } - bool isPressEvent() const override; + bool isBeginEvent() const override; bool isUpdateEvent() const override; - bool isReleaseEvent() const override; + bool isEndEvent() const override; protected: QSinglePointEvent(Type type, const QPointingDevice *dev, const QEventPoint &point, @@ -392,6 +392,9 @@ public: inline bool isInverted() const { return m_invertedScrolling; } inline bool hasPixelDelta() const { return !m_pixelDelta.isNull(); } + bool isBeginEvent() const override; + bool isUpdateEvent() const override; + bool isEndEvent() const override; Qt::MouseEventSource source() const { return Qt::MouseEventSource(m_source); } protected: @@ -996,9 +999,9 @@ public: QT_DEPRECATED_VERSION_X_6_0("Use points()") const QList &touchPoints() const { return points(); } #endif - bool isPressEvent() const override; + bool isBeginEvent() const override; bool isUpdateEvent() const override; - bool isReleaseEvent() const override; + bool isEndEvent() const override; protected: QObject *m_target = nullptr; -- cgit v1.2.3