From ce024f7c3695fbd4e46b7c6fb675c57ab01e8cb4 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 24 Dec 2021 09:29:54 +0100 Subject: [PATCH] fix flicker with workspaces anim off, turn anim off by default --- src/config/ConfigManager.cpp | 2 +- src/windowManager.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 7e2e32e..f34a05c 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -43,7 +43,7 @@ void ConfigManager::init() { configValues["anim:enabled"].intValue = 0; configValues["anim:cheap"].intValue = 1; configValues["anim:borders"].intValue = 1; - configValues["anim:workspaces"].intValue = 1; + configValues["anim:workspaces"].intValue = 0; if (!g_pWindowManager->statusBar) { isFirstLaunch = true; diff --git a/src/windowManager.cpp b/src/windowManager.cpp index 8983d7d..5e75652 100644 --- a/src/windowManager.cpp +++ b/src/windowManager.cpp @@ -1979,11 +1979,17 @@ void CWindowManager::startWipeAnimOnWorkspace(const int& oldwork, const int& new for (auto& work : workspaces) { if (work.getID() == oldwork) { - work.setCurrentOffset(Vector2D(0,0)); + if (ConfigManager::getInt("anim:workspaces") == 1) + work.setCurrentOffset(Vector2D(0,0)); + else + work.setCurrentOffset(Vector2D(150000, 150000)); work.setGoalOffset(Vector2D(PMONITOR->vecSize.x, 0)); work.setAnimationInProgress(true); } else if (work.getID() == newwork) { - work.setCurrentOffset(Vector2D(-PMONITOR->vecSize.x, 0)); + if (ConfigManager::getInt("anim:workspaces") == 1) + work.setCurrentOffset(Vector2D(-PMONITOR->vecSize.x, 0)); + else + work.setCurrentOffset(Vector2D(0, 0)); work.setGoalOffset(Vector2D(0, 0)); work.setAnimationInProgress(true); }