diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-14 16:13:16 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-17 19:03:24 +0200 |
commit | 153dcfbbba822390ccb7109499088cc954100a26 (patch) | |
tree | 281f214916317d321fed680428b371e8ae9910b7 /tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | |
parent | 55a7dd458102d63ba6c21a3a5ec7c3365653405e (diff) |
Rename is[Begin|Update|End]Event, reimplement in QWheelEvent
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ø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp')
-rw-r--r-- | tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<QEventPoint>() << @@ -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() |