From 7e147160435281449c8d56b9abf33e87c4b8041f Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 19 Mar 2022 18:29:26 +0200 Subject: [PATCH] Revert "Make overview and present windows use realtime gestures" This reverts commit 6729380c54fc9efb7006eb4edac999f6449fc5bf. It didn't go through code review process. --- src/effects/overview/overvieweffect.cpp | 9 +-------- src/effects/presentwindows/presentwindows.cpp | 10 +--------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/effects/overview/overvieweffect.cpp b/src/effects/overview/overvieweffect.cpp index d8d6a78bea..d0cbe09a5a 100644 --- a/src/effects/overview/overvieweffect.cpp +++ b/src/effects/overview/overvieweffect.cpp @@ -39,14 +39,7 @@ OverviewEffect::OverviewEffect() KGlobalAccel::self()->setShortcut(m_toggleAction, {defaultToggleShortcut}); m_toggleShortcut = KGlobalAccel::self()->shortcut(m_toggleAction); effects->registerGlobalShortcut({defaultToggleShortcut}, m_toggleAction); - effects->registerRealtimeTouchpadSwipeShortcut(SwipeDirection::Up, 4, new QAction(), [this](qreal cb) { //m_toggleAction - if (cb > .2 && !isRunning()) { - activate(); - } - if (cb <= .2 && isRunning()) { - deactivate(); - } - }); + effects->registerTouchpadSwipeShortcut(SwipeDirection::Up, 4, m_toggleAction); connect(effects, &EffectsHandler::screenAboutToLock, this, &OverviewEffect::realDeactivate); diff --git a/src/effects/presentwindows/presentwindows.cpp b/src/effects/presentwindows/presentwindows.cpp index c76b4c3c2a..9f7e5fce19 100644 --- a/src/effects/presentwindows/presentwindows.cpp +++ b/src/effects/presentwindows/presentwindows.cpp @@ -82,15 +82,7 @@ PresentWindowsEffect::PresentWindowsEffect() KGlobalAccel::self()->setShortcut(exposeAllAction, QList() << (Qt::CTRL | Qt::Key_F10) << Qt::Key_LaunchC); shortcutAll = KGlobalAccel::self()->shortcut(exposeAllAction); effects->registerGlobalShortcut(Qt::CTRL + Qt::Key_F10, exposeAllAction); - effects->registerRealtimeTouchpadSwipeShortcut(SwipeDirection::Down, 4, new QAction(), [this](qreal cb) { //exposeAllAction - m_mode = ModeAllDesktops; - if (cb > .2 && !m_activated) { - setActive(true); - } - if (cb < .2 && m_activated) { - setActive(false); - } - }); + effects->registerTouchpadSwipeShortcut(SwipeDirection::Down, 4, exposeAllAction); connect(exposeAllAction, &QAction::triggered, this, &PresentWindowsEffect::toggleActiveAllDesktops); QAction* exposeClassAction = m_exposeClassAction;