diff --git a/autotests/integration/decoration_input_test.cpp b/autotests/integration/decoration_input_test.cpp index 7390b34aab..61312a389b 100644 --- a/autotests/integration/decoration_input_test.cpp +++ b/autotests/integration/decoration_input_test.cpp @@ -655,9 +655,9 @@ void DecorationInputTest::testModifierScrollOpacity() } QFETCH(int, modifierKey); Test::keyboardKeyPressed(modifierKey, timestamp++); - Test::pointerAxisVertical(-5, timestamp++); + Test::pointerAxisVertical(-15, timestamp++); QCOMPARE(window->opacity(), 0.6); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QCOMPARE(window->opacity(), 0.5); Test::keyboardKeyReleased(modifierKey, timestamp++); if (capsLock) { diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp index 338ad6eca9..8ebd191e9a 100644 --- a/autotests/integration/internal_window.cpp +++ b/autotests/integration/internal_window.cpp @@ -291,9 +291,9 @@ void InternalWindowTest::testPointerAxis() quint32 timestamp = 1; Test::pointerMotion(QPoint(50, 50), timestamp++); - Test::pointerAxisVertical(5.0, timestamp++); + Test::pointerAxisVertical(15.0, timestamp++); QTRY_COMPARE(wheelSpy.count(), 1); - Test::pointerAxisHorizontal(5.0, timestamp++); + Test::pointerAxisHorizontal(15.0, timestamp++); QTRY_COMPARE(wheelSpy.count(), 2); } @@ -465,9 +465,9 @@ void InternalWindowTest::testModifierScroll() QCOMPARE(internalWindow->opacity(), 0.5); quint32 timestamp = 1; Test::keyboardKeyPressed(KEY_LEFTMETA, timestamp++); - Test::pointerAxisVertical(-5, timestamp++); + Test::pointerAxisVertical(-15, timestamp++); QCOMPARE(internalWindow->opacity(), 0.6); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QCOMPARE(internalWindow->opacity(), 0.5); Test::keyboardKeyReleased(KEY_LEFTMETA, timestamp++); } diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 8d3b5d1a72..62fe990550 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -339,7 +339,7 @@ void LockScreenTest::testPointerAxis() // and simulate axis Test::pointerAxisHorizontal(5.0, timestamp++); QVERIFY(!axisChangedSpy.wait(10)); - Test::pointerAxisVertical(5.0, timestamp++); + Test::pointerAxisVertical(15.0, timestamp++); QVERIFY(!axisChangedSpy.wait(10)); // and unlock @@ -348,9 +348,9 @@ void LockScreenTest::testPointerAxis() QCOMPARE(enteredSpy.count(), 2); // and move axis again - Test::pointerAxisHorizontal(5.0, timestamp++); + Test::pointerAxisHorizontal(15.0, timestamp++); QVERIFY(axisChangedSpy.wait()); - Test::pointerAxisVertical(5.0, timestamp++); + Test::pointerAxisVertical(15.0, timestamp++); QVERIFY(axisChangedSpy.wait()); } diff --git a/autotests/integration/no_global_shortcuts_test.cpp b/autotests/integration/no_global_shortcuts_test.cpp index 5e5ea1676b..65add952ea 100644 --- a/autotests/integration/no_global_shortcuts_test.cpp +++ b/autotests/integration/no_global_shortcuts_test.cpp @@ -177,9 +177,9 @@ void NoGlobalShortcutsTest::testAxisShortcut() quint32 timestamp = 1; Test::keyboardKeyPressed(KEY_LEFTMETA, timestamp++); if (direction == Qt::Vertical) { - Test::pointerAxisVertical(sign * 5.0, timestamp++); + Test::pointerAxisVertical(sign * 15.0, timestamp++); } else { - Test::pointerAxisHorizontal(sign * 5.0, timestamp++); + Test::pointerAxisHorizontal(sign * 15.0, timestamp++); } QCoreApplication::instance()->processEvents(); QCOMPARE(actionSpy.count(), 0); diff --git a/autotests/integration/pointer_constraints_test.cpp b/autotests/integration/pointer_constraints_test.cpp index 06ab277863..497bb5ac73 100644 --- a/autotests/integration/pointer_constraints_test.cpp +++ b/autotests/integration/pointer_constraints_test.cpp @@ -189,9 +189,9 @@ void TestPointerConstraints::testConfinedPointer() QCOMPARE(window->opacity(), 0.5); // pointer is confined so shortcut should not work - Test::pointerAxisVertical(-5, timestamp++); + Test::pointerAxisVertical(-15, timestamp++); QCOMPARE(window->opacity(), 0.5); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QCOMPARE(window->opacity(), 0.5); Test::keyboardKeyReleased(KEY_LEFTALT, timestamp++); diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index f444471562..12c8c5736b 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -695,9 +695,9 @@ void PointerInputTest::testModifierScrollOpacity() } QFETCH(int, modifierKey); Test::keyboardKeyPressed(modifierKey, timestamp++); - Test::pointerAxisVertical(-5, timestamp++); + Test::pointerAxisVertical(-15, timestamp++); QCOMPARE(window->opacity(), 0.6); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QCOMPARE(window->opacity(), 0.5); Test::keyboardKeyReleased(modifierKey, timestamp++); if (capsLock) { @@ -753,9 +753,9 @@ void PointerInputTest::testModifierScrollOpacityGlobalShortcutsDisabled() // simulate modifier+wheel quint32 timestamp = 1; Test::keyboardKeyPressed(KEY_LEFTMETA, timestamp++); - Test::pointerAxisVertical(-5, timestamp++); + Test::pointerAxisVertical(-15, timestamp++); QCOMPARE(window->opacity(), 0.5); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QCOMPARE(window->opacity(), 0.5); Test::keyboardKeyReleased(KEY_LEFTMETA, timestamp++); @@ -800,7 +800,7 @@ void PointerInputTest::testScrollAction() quint32 timestamp = 1; QVERIFY(!window1->isActive()); - Test::pointerAxisVertical(5, timestamp++); + Test::pointerAxisVertical(15, timestamp++); QVERIFY(window1->isActive()); // but also the wheel event should be passed to the window diff --git a/autotests/integration/touch_input_test.cpp b/autotests/integration/touch_input_test.cpp index 8f739ff2a5..df68e1b47e 100644 --- a/autotests/integration/touch_input_test.cpp +++ b/autotests/integration/touch_input_test.cpp @@ -146,7 +146,7 @@ void TouchInputTest::testTouchHidesCursor() QCOMPARE(Cursors::self()->isCursorHidden(), true); // wheel should also show - Test::pointerAxisVertical(1.0, timestamp++); + Test::pointerAxisVertical(15.0, timestamp++); QCOMPARE(Cursors::self()->isCursorHidden(), false); }