diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-30 12:59:04 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-12-01 14:32:33 +0000 |
commit | cd520bab8a7dc7b1c7de5ab80779877be31a7633 (patch) | |
tree | 498378f96eb41987c9253072c24f1ddf49b68522 /tests | |
parent | c2737ab795bd86c7ead36f36474a1aabf4f0c349 (diff) |
Fix tst_gifs warnings about mouse events being outside window
Also replaces event capturer C++ output with moveSmoothly() calls.
Change-Id: Ie1cccf6c85517a187588868a90902b82e01d0775
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-button.qml | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-slider.qml | 2 | ||||
-rw-r--r-- | tests/manual/gifs/tst_gifs.cpp | 122 |
3 files changed, 24 insertions, 102 deletions
diff --git a/tests/manual/gifs/data/qtlabscontrols-button.qml b/tests/manual/gifs/data/qtlabscontrols-button.qml index f804b987..3d9a4f45 100644 --- a/tests/manual/gifs/data/qtlabscontrols-button.qml +++ b/tests/manual/gifs/data/qtlabscontrols-button.qml @@ -50,6 +50,6 @@ Window { Button { id: button text: pressed ? "Pressed" : "Normal" - width: 80 + anchors.centerIn: parent } } diff --git a/tests/manual/gifs/data/qtlabscontrols-slider.qml b/tests/manual/gifs/data/qtlabscontrols-slider.qml index 92dc8bf8..af582d7c 100644 --- a/tests/manual/gifs/data/qtlabscontrols-slider.qml +++ b/tests/manual/gifs/data/qtlabscontrols-slider.qml @@ -47,6 +47,8 @@ Window { height: slider.implicitHeight visible: true + property alias slider: slider + Slider { id: slider anchors.centerIn: parent diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index e7f50f2b..5ae15e79 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -171,107 +171,27 @@ void tst_Gifs::slider() gifRecorder.start(); QQuickWindow *window = gifRecorder.window(); - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(18, 19), 122); - QTest::mouseMove(window, QPoint(20, 19), 154); - QTest::mouseMove(window, QPoint(22, 19), 10); - QTest::mouseMove(window, QPoint(24, 20), 10); - QTest::mouseMove(window, QPoint(27, 20), 11); - QTest::mouseMove(window, QPoint(31, 20), 10); - QTest::mouseMove(window, QPoint(33, 20), 10); - QTest::mouseMove(window, QPoint(36, 21), 11); - QTest::mouseMove(window, QPoint(40, 22), 10); - QTest::mouseMove(window, QPoint(43, 22), 10); - QTest::mouseMove(window, QPoint(45, 22), 11); - QTest::mouseMove(window, QPoint(50, 23), 16); - QTest::mouseMove(window, QPoint(54, 23), 17); - QTest::mouseMove(window, QPoint(60, 24), 16); - QTest::mouseMove(window, QPoint(63, 24), 17); - QTest::mouseMove(window, QPoint(65, 24), 0); - QTest::mouseMove(window, QPoint(66, 24), 17); - QTest::mouseMove(window, QPoint(68, 24), 0); - QTest::mouseMove(window, QPoint(70, 24), 16); - QTest::mouseMove(window, QPoint(71, 24), 1); - QTest::mouseMove(window, QPoint(73, 24), 16); - QTest::mouseMove(window, QPoint(74, 24), 0); - QTest::mouseMove(window, QPoint(76, 24), 16); - QTest::mouseMove(window, QPoint(77, 24), 0); - QTest::mouseMove(window, QPoint(78, 24), 17); - QTest::mouseMove(window, QPoint(80, 24), 0); - QTest::mouseMove(window, QPoint(81, 24), 17); - QTest::mouseMove(window, QPoint(82, 24), 0); - QTest::mouseMove(window, QPoint(83, 24), 17); - QTest::mouseMove(window, QPoint(84, 24), 16); - QTest::mouseMove(window, QPoint(85, 24), 48); - QTest::mouseMove(window, QPoint(85, 23), 10); - QTest::mouseMove(window, QPoint(86, 23), 11); - QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(86, 23), 71); - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(86, 22), 246); - QTest::mouseMove(window, QPoint(87, 21), 123); - QTest::mouseMove(window, QPoint(89, 21), 10); - QTest::mouseMove(window, QPoint(91, 20), 10); - QTest::mouseMove(window, QPoint(97, 20), 10); - QTest::mouseMove(window, QPoint(101, 20), 11); - QTest::mouseMove(window, QPoint(105, 20), 11); - QTest::mouseMove(window, QPoint(113, 20), 10); - QTest::mouseMove(window, QPoint(120, 20), 13); - QTest::mouseMove(window, QPoint(129, 20), 17); - QTest::mouseMove(window, QPoint(140, 20), 17); - QTest::mouseMove(window, QPoint(150, 20), 16); - QTest::mouseMove(window, QPoint(156, 20), 1); - QTest::mouseMove(window, QPoint(161, 20), 16); - QTest::mouseMove(window, QPoint(166, 20), 0); - QTest::mouseMove(window, QPoint(172, 20), 17); - QTest::mouseMove(window, QPoint(177, 20), 0); - QTest::mouseMove(window, QPoint(181, 20), 16); - QTest::mouseMove(window, QPoint(186, 20), 1); - QTest::mouseMove(window, QPoint(191, 22), 16); - QTest::mouseMove(window, QPoint(194, 22), 0); - QTest::mouseMove(window, QPoint(197, 22), 17); - QTest::mouseMove(window, QPoint(201, 22), 0); - QTest::mouseMove(window, QPoint(204, 22), 17); - QTest::mouseMove(window, QPoint(207, 22), 0); - QTest::mouseMove(window, QPoint(211, 22), 16); - QTest::mouseMove(window, QPoint(214, 22), 0); - QTest::mouseMove(window, QPoint(216, 22), 10); - QTest::mouseMove(window, QPoint(222, 22), 11); - QTest::mouseMove(window, QPoint(226, 22), 10); - QTest::mouseMove(window, QPoint(227, 22), 10); - QTest::mouseMove(window, QPoint(229, 22), 10); - QTest::mouseMove(window, QPoint(230, 22), 11); - QTest::mouseMove(window, QPoint(232, 22), 10); - QTest::mouseMove(window, QPoint(231, 22), 101); - QTest::mouseMove(window, QPoint(230, 23), 10); - QTest::mouseMove(window, QPoint(229, 23), 10); - QTest::mouseMove(window, QPoint(225, 24), 10); - QTest::mouseMove(window, QPoint(221, 24), 10); - QTest::mouseMove(window, QPoint(218, 25), 10); - QTest::mouseMove(window, QPoint(214, 25), 11); - QTest::mouseMove(window, QPoint(201, 25), 10); - QTest::mouseMove(window, QPoint(192, 25), 10); - QTest::mouseMove(window, QPoint(183, 25), 11); - QTest::mouseMove(window, QPoint(163, 25), 10); - QTest::mouseMove(window, QPoint(154, 25), 11); - QTest::mouseMove(window, QPoint(145, 23), 13); - QTest::mouseMove(window, QPoint(136, 23), 1); - QTest::mouseMove(window, QPoint(128, 21), 16); - QTest::mouseMove(window, QPoint(120, 21), 0); - QTest::mouseMove(window, QPoint(112, 20), 17); - QTest::mouseMove(window, QPoint(110, 20), 0); - QTest::mouseMove(window, QPoint(102, 20), 16); - QTest::mouseMove(window, QPoint(94, 18), 0); - QTest::mouseMove(window, QPoint(86, 18), 16); - QTest::mouseMove(window, QPoint(78, 18), 0); - QTest::mouseMove(window, QPoint(70, 18), 17); - QTest::mouseMove(window, QPoint(62, 18), 0); - QTest::mouseMove(window, QPoint(54, 18), 16); - QTest::mouseMove(window, QPoint(47, 16), 0); - QTest::mouseMove(window, QPoint(39, 16), 16); - QTest::mouseMove(window, QPoint(31, 16), 0); - QTest::mouseMove(window, QPoint(26, 16), 17); - QTest::mouseMove(window, QPoint(20, 15), 0); - QTest::mouseMove(window, QPoint(8, 15), 17); - QTest::mouseMove(window, QPoint(0, 15), 16); - QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15), 215); + QQuickItem *slider = window->property("slider").value<QQuickItem*>(); + QVERIFY(slider); + QQuickItem *handle = slider->property("handle").value<QQuickItem*>(); + QVERIFY(handle); + + const QPoint handleCenter = handle->mapToItem(window->contentItem(), + QPoint(handle->width() / 2, handle->height() / 2)).toPoint(); + + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, handleCenter, 100); + QPoint pos1 = handleCenter + QPoint(slider->width() * 0.3, 0); + moveSmoothly(window, handleCenter, pos1, pos1.x() - handleCenter.x(), QEasingCurve::OutQuint, 10); + QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, pos1, 20); + + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, handleCenter, 100); + const QPoint pos2 = QPoint(slider->width() - handleCenter.x() + slider->property("rightPadding").toInt(), handleCenter.y()); + moveSmoothly(window, pos1, pos2, pos2.x() - pos1.x(), QEasingCurve::OutQuint, 10); + QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, pos2, 20); + + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, pos2, 100); + moveSmoothly(window, pos2, handleCenter, qAbs(handleCenter.x() - pos2.x()), QEasingCurve::OutQuint, 10); + QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, handleCenter, 20); gifRecorder.waitForFinish(); } |