From 7b6eca612ee0682459e138f6710181d52c86dce5 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 28 Apr 2023 11:40:20 +0300 Subject: [PATCH] Stop quick tile combine timer when activating a window The quick tile test waits 1s to ensure that the quick tile combine timer is not active. On the other hand, if the active window changes, it makes sense to reset quick tile combine status. That also lets us get rid of the QTest::qWait() in QuickTilingTest::testShortcut(). --- autotests/integration/quick_tiling_test.cpp | 4 ---- src/activation.cpp | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp index e1feb88b48..935dccb575 100644 --- a/autotests/integration/quick_tiling_test.cpp +++ b/autotests/integration/quick_tiling_test.cpp @@ -712,10 +712,6 @@ void QuickTilingTest::testShortcut() const int numberOfQuickTileActions = shortcutList.count(); - if (numberOfQuickTileActions > 1) { - QTest::qWait(1001); - } - for (QString shortcut : shortcutList) { // invoke global shortcut through dbus auto msg = QDBusMessage::createMethodCall( diff --git a/src/activation.cpp b/src/activation.cpp index 8b273cf426..811ca0b0a1 100644 --- a/src/activation.cpp +++ b/src/activation.cpp @@ -333,6 +333,8 @@ void Workspace::activateWindow(Window *window, bool force) // updateUserTime is X11 specific x11Window->updateUserTime(); } + + m_quickTileCombineTimer->stop(); } /**