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 --- tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp | 16 ++++++++-------- tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index 865785a108..c5bc7a9460 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -162,23 +162,23 @@ void tst_QMouseEvent::mouseEventBasic() QCOMPARE(me.isAccepted(), true); QCOMPARE(me.button(), Qt::LeftButton); QCOMPARE(me.buttons(), Qt::LeftButton); - QVERIFY(me.isPressEvent()); - QVERIFY(!me.isReleaseEvent()); + QVERIFY(me.isBeginEvent()); + QVERIFY(!me.isEndEvent()); QCOMPARE(me.position(), local); QCOMPARE(me.scenePosition(), scene); QCOMPARE(me.globalPosition(), screen); // Press right button while left is already pressed me = QMouseEvent(QEvent::MouseButtonPress, local, scene, screen, Qt::RightButton, Qt::LeftButton | Qt::RightButton, Qt::NoModifier); - QVERIFY(me.isPressEvent()); - QVERIFY(!me.isReleaseEvent()); + QVERIFY(me.isBeginEvent()); + QVERIFY(!me.isEndEvent()); // Release right button while left is still pressed me = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::RightButton, Qt::LeftButton, Qt::NoModifier); - QVERIFY(!me.isPressEvent()); - QVERIFY(me.isReleaseEvent()); + QVERIFY(!me.isBeginEvent()); + QVERIFY(me.isEndEvent()); // Release left button in the usual way me = QMouseEvent(QEvent::MouseButtonRelease, local, scene, screen, Qt::LeftButton, Qt::NoButton, Qt::NoModifier); - QVERIFY(!me.isPressEvent()); - QVERIFY(me.isReleaseEvent()); + QVERIFY(!me.isBeginEvent()); + QVERIFY(me.isEndEvent()); } void tst_QMouseEvent::checkMousePressEvent_data() diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 38e58c9cc0..dd36a28854 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -338,9 +338,9 @@ void tst_QTouchEvent::state() QEventPoint(1, QEventPoint::State::Pressed, {}, {})); QCOMPARE(touchEvent.touchPointStates(), QEventPoint::State::Stationary | QEventPoint::State::Pressed); QCOMPARE(touchEvent.pointCount(), 2); - QVERIFY(touchEvent.isPressEvent()); + QVERIFY(touchEvent.isBeginEvent()); QVERIFY(!touchEvent.isUpdateEvent()); - QVERIFY(!touchEvent.isReleaseEvent()); + QVERIFY(!touchEvent.isEndEvent()); QVERIFY(touchEvent.isInputEvent()); QVERIFY(touchEvent.isPointerEvent()); @@ -350,9 +350,9 @@ void tst_QTouchEvent::state() QEventPoint(1, QEventPoint::State::Pressed, {}, {})); QCOMPARE(touchEvent.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Pressed); QCOMPARE(touchEvent.pointCount(), 2); - QVERIFY(touchEvent.isPressEvent()); + QVERIFY(touchEvent.isBeginEvent()); QVERIFY(!touchEvent.isUpdateEvent()); - QVERIFY(!touchEvent.isReleaseEvent()); + QVERIFY(!touchEvent.isEndEvent()); touchEvent = QTouchEvent(QEvent::TouchBegin, touchScreenDevice, Qt::NoModifier, QList() << @@ -360,9 +360,9 @@ void tst_QTouchEvent::state() QEventPoint(1, QEventPoint::State::Released, {}, {})); QCOMPARE(touchEvent.touchPointStates(), QEventPoint::State::Updated | QEventPoint::State::Released); QCOMPARE(touchEvent.pointCount(), 2); - QVERIFY(!touchEvent.isPressEvent()); + QVERIFY(!touchEvent.isBeginEvent()); QVERIFY(!touchEvent.isUpdateEvent()); - QVERIFY(touchEvent.isReleaseEvent()); + QVERIFY(touchEvent.isEndEvent()); } void tst_QTouchEvent::touchDisabledByDefault() -- cgit v1.2.3