From 137b7aad7b4a82b2be45f7565bce7b304b323916 Mon Sep 17 00:00:00 2001 From: Maximilian Seidler Date: Thu, 2 Jan 2025 15:57:58 +0100 Subject: [PATCH] init linear bezier in setDefaultAnimationVars, remove import in ConfigManager --- CMakeLists.txt | 2 +- src/config/ConfigManager.cpp | 3 ++- src/config/ConfigManager.hpp | 2 -- src/managers/AnimationManager.cpp | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 044e40a6348..62b0cb2ebca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION}) pkg_check_modules(aquamarine_dep REQUIRED IMPORTED_TARGET aquamarine>=0.4.5) pkg_check_modules(hyprlang_dep REQUIRED IMPORTED_TARGET hyprlang>=0.3.2) pkg_check_modules(hyprcursor_dep REQUIRED IMPORTED_TARGET hyprcursor>=0.1.7) -pkg_check_modules(hyprutils_dep REQUIRED IMPORTED_TARGET hyprutils>=0.3.2) +pkg_check_modules(hyprutils_dep REQUIRED IMPORTED_TARGET hyprutils>=0.3.1) pkg_check_modules(hyprgraphics_dep REQUIRED IMPORTED_TARGET hyprgraphics>=0.1.1) add_compile_definitions(AQUAMARINE_VERSION="${aquamarine_dep_VERSION}") diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index ddb0ca0abb1..2ff348ca2a5 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -777,6 +777,8 @@ void CConfigManager::reload() { } void CConfigManager::setDefaultAnimationVars() { + g_pAnimationManager->addBezierWithName("linear", Vector2D(0.0, 0.0), Vector2D(1.0, 1.0)); + m_AnimationTree.createNode("__internal_fadeCTM"); m_AnimationTree.createNode("global"); @@ -824,7 +826,6 @@ std::optional CConfigManager::resetHLConfig() { m_vWindowRules.clear(); g_pKeybindManager->clearKeybinds(); g_pAnimationManager->removeAllBeziers(); - g_pAnimationManager->addBezierWithName("linear", Vector2D(0.0, 0.0), Vector2D(1.0, 1.0)); m_mAdditionalReservedAreas.clear(); m_dBlurLSNamespaces.clear(); m_vWorkspaceRules.clear(); diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp index 9830347f24c..a0819a05f3a 100644 --- a/src/config/ConfigManager.hpp +++ b/src/config/ConfigManager.hpp @@ -3,7 +3,6 @@ #include #define CONFIG_MANAGER_H -#include #include #include "../debug/Log.hpp" #include @@ -287,7 +286,6 @@ class CConfigManager { std::string m_szConfigErrors = ""; // internal methods - void setAnimForChildren(SP const); void updateBlurredLS(const std::string&, const bool); void setDefaultAnimationVars(); std::optional resetHLConfig(); diff --git a/src/managers/AnimationManager.cpp b/src/managers/AnimationManager.cpp index 6bfeed83356..690a31a9e38 100644 --- a/src/managers/AnimationManager.cpp +++ b/src/managers/AnimationManager.cpp @@ -34,8 +34,6 @@ static int wlTick(SP self, void* data) { CHyprAnimationManager::CHyprAnimationManager() { m_pAnimationTimer = SP(new CEventLoopTimer(std::chrono::microseconds(500), wlTick, nullptr)); g_pEventLoopManager->addTimer(m_pAnimationTimer); - - addBezierWithName("linear", Vector2D(0.0, 0.0), Vector2D(1.0, 1.0)); } template