diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-07 01:01:54 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-07 01:01:55 +0100 |
commit | e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab (patch) | |
tree | ca450c633cbce2c86293b302d6e448e652e0136b /tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp | |
parent | 6a7c8749712c33e27cdbc93efdf54eddf8e7631f (diff) | |
parent | 895302829b46e00cde8eef13eb7c630af5d771e2 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I5209d833e171c795556c075e2a5f964b59b6df2e
Diffstat (limited to 'tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp')
-rw-r--r-- | tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp index 0c544ef484..eb210c2112 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp @@ -60,6 +60,7 @@ private slots: void touchDragMultiSliders(); void touchPassiveGrabbers_data(); void touchPassiveGrabbers(); + void touchPinchAndMouseMove(); private: void createView(QScopedPointer<QQuickView> &window, const char *fileName); @@ -521,6 +522,51 @@ void tst_DragHandler::touchPassiveGrabbers() QQuickTouchUtils::flush(window); } +void tst_DragHandler::touchPinchAndMouseMove() +{ + QScopedPointer<QQuickView> windowPtr; + createView(windowPtr, "draghandler_and_pinchhandler.qml"); + QQuickView *window = windowPtr.data(); + QQuickItem *rect = window->rootObject()->findChild<QQuickItem*>(QLatin1String("Rect")); + QQuickPointerHandler *pinchHandler = window->rootObject()->findChild<QQuickPointerHandler*>(QLatin1String("PinchHandler")); + + QPoint p1(150,200); + QPoint p2(250,200); + + // Trigger a scale pinch, PinchHandler should activate + QTest::QTouchEventSequence touch = QTest::touchEvent(window, touchDevice); + touch.press(1, p1).press(2, p2).commit(); + QQuickTouchUtils::flush(window); + QPoint delta(10,0); + for (int i = 0; i < 10 && !pinchHandler->active(); ++i) { + p1-=delta; + p2+=delta; + touch.move(1, p1).move(2, p2).commit(); + QQuickTouchUtils::flush(window); + } + QCOMPARE(pinchHandler->active(), true); + + // While having the touch points pressed, send wrong mouse event as MS Windows did: + // * A MoveMove with LeftButton down + // (in order to synthesize that, qtestMouseButtons needs to be modified) + // (This will make the DragHandler do a passive grab) + QTestPrivate::qtestMouseButtons = Qt::LeftButton; + QTest::mouseMove(window, p1 + delta); + + touch.release(1, p1).release(2, p2).commit(); + QQuickTouchUtils::flush(window); + + // Now move the mouse with no buttons down and check if the rect did not move + // At this point, no touch points are pressed and no mouse buttons are pressed. + QTestPrivate::qtestMouseButtons = Qt::NoButton; + QSignalSpy rectMovedSpy(rect, SIGNAL(xChanged())); + for (int i = 0; i < 10; ++i) { + p1 += delta; + QTest::mouseMove(window, p1); + QCOMPARE(rectMovedSpy.count(), 0); + } +} + QTEST_MAIN(tst_DragHandler) #include "tst_qquickdraghandler.moc" |