add animation speed override option

KZDKM · Apr 11, 2024 · e3137ae · e3137ae
1 parent 0d7922b
commit e3137ae
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ hyprpm enable Hyprspace
 
 ### Animation
 - The panel uses the `windows` curve for a slide-in animation
+- Use `plugin:overview:overrideAnimSpeed` to override the animation speed
 
 ### Behaviors
 - `plugin:overview:autoDrag` mouse click always drags window when overview is open

diff --git a/src/Globals.hpp b/src/Globals.hpp
@@ -58,6 +58,7 @@ namespace Config {
     extern bool showNewWorkspace;
     extern bool showEmptyWorkspace;
 
+    extern float overrideAnimSpeed;
     extern float dragAlpha;
 }
 

diff --git a/src/Overview.cpp b/src/Overview.cpp
@@ -3,9 +3,18 @@
 
 CHyprspaceWidget::CHyprspaceWidget(uint64_t inOwnerID) {
     ownerID = inOwnerID;
-    // FIXME: add null check
-    curYOffset.create(g_pConfigManager->getAnimationPropertyConfig("windows"), AVARDAMAGE_ENTIRE);
-    workspaceScrollOffset.create(g_pConfigManager->getAnimationPropertyConfig("windows"), AVARDAMAGE_ENTIRE);
+
+    curAnimationConfig = *g_pConfigManager->getAnimationPropertyConfig("windows");
+
+    // the fuck is pValues???
+    curAnimation = *curAnimationConfig.pValues;
+    curAnimationConfig.pValues = &curAnimation;
+
+    if (Config::overrideAnimSpeed > 0)
+        curAnimation.internalSpeed = Config::overrideAnimSpeed;
+
+    curYOffset.create(&curAnimationConfig, AVARDAMAGE_ENTIRE);
+    workspaceScrollOffset.create(&curAnimationConfig, AVARDAMAGE_ENTIRE);
     curYOffset.setValueAndWarp(Config::panelHeight);
     workspaceScrollOffset.setValueAndWarp(0);
 }
@@ -61,6 +70,19 @@ void CHyprspaceWidget::hide() {
     g_pCompositor->scheduleFrameForMonitor(owner);
 }
 
+void CHyprspaceWidget::updateConfig() {
+    curAnimationConfig = *g_pConfigManager->getAnimationPropertyConfig("windows");
+
+    curAnimation = *curAnimationConfig.pValues;
+    curAnimationConfig.pValues = &curAnimation;
+
+    if (Config::overrideAnimSpeed > 0)
+        curAnimation.internalSpeed = Config::overrideAnimSpeed;
+
+    curYOffset.create(&curAnimationConfig, AVARDAMAGE_ENTIRE);
+    workspaceScrollOffset.create(&curAnimationConfig, AVARDAMAGE_ENTIRE);
+}
+
 bool CHyprspaceWidget::isActive() {
     return active;
 }
diff --git a/src/Overview.hpp b/src/Overview.hpp
@@ -7,6 +7,9 @@ class CHyprspaceWidget {
 
     uint64_t ownerID;
 
+    SAnimationPropertyConfig curAnimationConfig;
+    SAnimationPropertyConfig curAnimation;
+
     // for slide-in animation
     CAnimatedVariable<float> curYOffset;
 
@@ -29,6 +32,8 @@ class CHyprspaceWidget {
     void show();
     void hide();
 
+    void updateConfig();
+
     void draw(timespec*); // call before renderWorkspaceWindows
 
     void reserveArea(); // call after arrangeLayersForMonitor

diff --git a/src/main.cpp b/src/main.cpp
@@ -8,7 +8,6 @@ using namespace std;
 
 CFunctionHook* renderWorkspaceWindowsHook;
 CFunctionHook* arrangeLayersForMonitorHook;
-CFunctionHook* recalculateMonitorHook;
 CFunctionHook* changeWorkspaceHook;
 CFunctionHook* getWorkspaceRuleForHook;
 CFunctionHook* onMouseEventHook;
@@ -49,6 +48,8 @@ bool Config::exitOnSwitch = false;
 bool Config::showNewWorkspace = true;
 bool Config::showEmptyWorkspace = true;
 
+float Config::overrideAnimSpeed = 0;
+
 float Config::dragAlpha = 0.2;
 
 int hyprsplitNumWorkspaces = -1;
@@ -245,6 +246,12 @@ void reloadConfig() {
     Config::showNewWorkspace = std::any_cast<Hyprlang::INT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:showNewWorkspace")->getValue());
     Config::showEmptyWorkspace = std::any_cast<Hyprlang::INT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:showEmptyWorkspace")->getValue());
 
+    Config::overrideAnimSpeed = std::any_cast<Hyprlang::FLOAT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:overrideAnimSpeed")->getValue());
+
+    for (auto& widget : g_overviewWidgets) {
+        widget->updateConfig();
+    }
+
     Config::dragAlpha = std::any_cast<Hyprlang::FLOAT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:dragAlpha")->getValue());
 
     Hyprlang::CConfigValue* numWorkspacesConfig = HyprlandAPI::getConfigValue(pHandle, "plugin:hyprsplit:num_workspaces");
@@ -296,6 +303,7 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE inHandle) {
     HyprlandAPI::addConfigValue(pHandle, "plugin:overview:showNewWorkspace", Hyprlang::INT{1});
     HyprlandAPI::addConfigValue(pHandle, "plugin:overview:showEmptyWorkspace", Hyprlang::INT{1});
 
+    HyprlandAPI::addConfigValue(pHandle, "plugin:overview:overrideAnimSpeed", Hyprlang::FLOAT{0.0});
     HyprlandAPI::addConfigValue(pHandle, "plugin:overview:dragAlpha", Hyprlang::FLOAT{0.2});
 
     reloadConfig();
@@ -365,8 +373,6 @@ APICALL EXPORT void PLUGIN_EXIT() {
         arrangeLayersForMonitorHook->unhook();
     if (changeWorkspaceHook)
         changeWorkspaceHook->unhook();
-    if (recalculateMonitorHook)
-        recalculateMonitorHook->unhook();
     if (getWorkspaceRuleForHook)
         getWorkspaceRuleForHook->unhook();
     if (onMouseEventHook)