From 10f529ada72270cb5a903aea118fc79114352b78 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 26 Aug 2022 11:26:23 +0200 Subject: [PATCH] added a specialWorkspace anim leaf --- src/config/ConfigManager.cpp | 3 +++ src/helpers/Workspace.cpp | 4 ++-- src/managers/AnimationManager.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index cb719419..9d8a1110 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -199,6 +199,7 @@ void CConfigManager::setDefaultAnimationVars() { // border // workspaces + INITANIMCFG("specialWorkspace"); } // init the values @@ -225,6 +226,8 @@ void CConfigManager::setDefaultAnimationVars() { CREATEANIMCFG("fadeOut", "fade"); CREATEANIMCFG("fadeSwitch", "fade"); CREATEANIMCFG("fadeShadow", "fade"); + + CREATEANIMCFG("specialWorkspace", "workspaces"); } void CConfigManager::init() { diff --git a/src/helpers/Workspace.cpp b/src/helpers/Workspace.cpp index 878c3894..0ac976ba 100644 --- a/src/helpers/Workspace.cpp +++ b/src/helpers/Workspace.cpp @@ -26,9 +26,9 @@ CWorkspace::CWorkspace(int monitorID, std::string name, bool special) { } m_vRenderOffset.m_pWorkspace = this; - m_vRenderOffset.create(AVARTYPE_VECTOR, g_pConfigManager->getAnimationPropertyConfig("workspaces"), nullptr, AVARDAMAGE_ENTIRE); + m_vRenderOffset.create(AVARTYPE_VECTOR, special ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"), nullptr, AVARDAMAGE_ENTIRE); m_fAlpha.m_pWorkspace = this; - m_fAlpha.create(AVARTYPE_FLOAT, g_pConfigManager->getAnimationPropertyConfig("workspaces"), nullptr, AVARDAMAGE_ENTIRE); + m_fAlpha.create(AVARTYPE_FLOAT, special ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"), nullptr, AVARDAMAGE_ENTIRE); m_fAlpha.setValueAndWarp(255.f); g_pEventManager->postEvent({"createworkspace", m_szName}, true); diff --git a/src/managers/AnimationManager.cpp b/src/managers/AnimationManager.cpp index 14f2fdc9..d2290f0a 100644 --- a/src/managers/AnimationManager.cpp +++ b/src/managers/AnimationManager.cpp @@ -428,7 +428,7 @@ std::string CAnimationManager::styleValidInConfigVar(const std::string& config, } return "unknown style"; - } else if (config == "workspaces") { + } else if (config == "workspaces" || config == "specialWorkspace") { if (style == "slide" || style == "slidevert" || style == "fade") return "";