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/qmouseevent/tst_qmouseevent.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/qmouseevent/tst_qmouseevent.cpp')
-rw-r--r-- | tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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() |