summaryrefslogtreecommitdiff
path: root/src/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'src/desktop')
-rw-r--r--src/desktop/LayerSurface.cpp147
-rw-r--r--src/desktop/LayerSurface.hpp1
-rw-r--r--src/desktop/Popup.cpp2
-rw-r--r--src/desktop/Window.cpp2
-rw-r--r--src/desktop/Workspace.cpp115
-rw-r--r--src/desktop/Workspace.hpp1
6 files changed, 12 insertions, 256 deletions
diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp
index de38a843..a89f9dba 100644
--- a/src/desktop/LayerSurface.cpp
+++ b/src/desktop/LayerSurface.cpp
@@ -4,7 +4,8 @@
#include "../protocols/LayerShell.hpp"
#include "../protocols/core/Compositor.hpp"
#include "../managers/SeatManager.hpp"
-#include "../managers/AnimationManager.hpp"
+#include "../managers/animation/AnimationManager.hpp"
+#include "../managers/animation/DesktopAnimationManager.hpp"
#include "../render/Renderer.hpp"
#include "../config/ConfigManager.hpp"
#include "../helpers/Monitor.hpp"
@@ -99,7 +100,7 @@ void CLayerSurface::onDestroy() {
} else {
Debug::log(LOG, "Removing LayerSurface that wasn't mapped.");
if (m_alpha)
- m_alpha->setValueAndWarp(0.f);
+ g_pDesktopAnimationManager->startAnimation(m_self.lock(), CDesktopAnimationManager::ANIMATION_TYPE_OUT);
m_fadingOut = true;
g_pCompositor->addToFadingOutSafe(m_self.lock());
}
@@ -183,9 +184,9 @@ void CLayerSurface::onMap() {
CBox geomFixed = {m_geometry.x + PMONITOR->m_position.x, m_geometry.y + PMONITOR->m_position.y, m_geometry.width, m_geometry.height};
g_pHyprRenderer->damageBox(geomFixed);
- const bool FULLSCREEN = PMONITOR->m_activeWorkspace && PMONITOR->m_activeWorkspace->m_hasFullscreenWindow && PMONITOR->m_activeWorkspace->m_fullscreenMode == FSMODE_FULLSCREEN;
- startAnimation(!(m_layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP && FULLSCREEN && !GRABSFOCUS));
+ g_pDesktopAnimationManager->startAnimation(m_self.lock(), CDesktopAnimationManager::ANIMATION_TYPE_IN);
+
m_readyToDelete = false;
m_fadingOut = false;
@@ -213,7 +214,7 @@ void CLayerSurface::onUnmap() {
if (m_layerSurface && m_layerSurface->m_surface)
m_layerSurface->m_surface->unmap();
- startAnimation(false);
+ g_pDesktopAnimationManager->startAnimation(m_self.lock(), CDesktopAnimationManager::ANIMATION_TYPE_OUT);
return;
}
@@ -224,7 +225,9 @@ void CLayerSurface::onUnmap() {
// make a snapshot and start fade
g_pHyprRenderer->makeSnapshot(m_self.lock());
- startAnimation(false);
+ g_pDesktopAnimationManager->startAnimation(m_self.lock(), CDesktopAnimationManager::ANIMATION_TYPE_OUT);
+
+ m_fadingOut = true;
m_mapped = false;
if (m_layerSurface && m_layerSurface->m_surface)
@@ -453,138 +456,6 @@ void CLayerSurface::applyRules() {
}
}
-void CLayerSurface::startAnimation(bool in, bool instant) {
- if (in) {
- m_realPosition->setConfig(g_pConfigManager->getAnimationPropertyConfig("layersIn"));
- m_realSize->setConfig(g_pConfigManager->getAnimationPropertyConfig("layersIn"));
- m_alpha->setConfig(g_pConfigManager->getAnimationPropertyConfig("fadeLayersIn"));
- } else {
- m_realPosition->setConfig(g_pConfigManager->getAnimationPropertyConfig("layersOut"));
- m_realSize->setConfig(g_pConfigManager->getAnimationPropertyConfig("layersOut"));
- m_alpha->setConfig(g_pConfigManager->getAnimationPropertyConfig("fadeLayersOut"));
- }
-
- const auto ANIMSTYLE = m_animationStyle.value_or(m_realPosition->getStyle());
- if (ANIMSTYLE.starts_with("slide")) {
- // get closest edge
- const auto MIDDLE = m_geometry.middle();
-
- const auto PMONITOR = g_pCompositor->getMonitorFromVector(MIDDLE);
-
- if (!PMONITOR) { // can rarely happen on exit
- m_alpha->setValueAndWarp(in ? 1.F : 0.F);
- return;
- }
-
- int force = -1;
-
- CVarList args(ANIMSTYLE, 0, 's');
- if (args.size() > 1) {
- const auto ARG2 = args[1];
- if (ARG2 == "top")
- force = 0;
- else if (ARG2 == "bottom")
- force = 1;
- else if (ARG2 == "left")
- force = 2;
- else if (ARG2 == "right")
- force = 3;
- }
-
- const std::array<Vector2D, 4> edgePoints = {
- PMONITOR->m_position + Vector2D{PMONITOR->m_size.x / 2, 0.0},
- PMONITOR->m_position + Vector2D{PMONITOR->m_size.x / 2, PMONITOR->m_size.y},
- PMONITOR->m_position + Vector2D{0.0, PMONITOR->m_size.y},
- PMONITOR->m_position + Vector2D{PMONITOR->m_size.x, PMONITOR->m_size.y / 2},
- };
-
- float closest = std::numeric_limits<float>::max();
- int leader = force;
- if (leader == -1) {
- for (size_t i = 0; i < 4; ++i) {
- float dist = MIDDLE.distance(edgePoints[i]);
- if (dist < closest) {
- leader = i;
- closest = dist;
- }
- }
- }
-
- m_realSize->setValueAndWarp(m_geometry.size());
- m_alpha->setValueAndWarp(in ? 0.f : 1.f);
- *m_alpha = in ? 1.f : 0.f;
-
- Vector2D prePos;
-
- switch (leader) {
- case 0:
- // TOP
- prePos = {m_geometry.x, PMONITOR->m_position.y - m_geometry.h};
- break;
- case 1:
- // BOTTOM
- prePos = {m_geometry.x, PMONITOR->m_position.y + PMONITOR->m_size.y};
- break;
- case 2:
- // LEFT
- prePos = {PMONITOR->m_position.x - m_geometry.w, m_geometry.y};
- break;
- case 3:
- // RIGHT
- prePos = {PMONITOR->m_position.x + PMONITOR->m_size.x, m_geometry.y};
- break;
- default: UNREACHABLE();
- }
-
- if (in) {
- m_realPosition->setValueAndWarp(prePos);
- *m_realPosition = m_geometry.pos();
- } else {
- m_realPosition->setValueAndWarp(m_geometry.pos());
- *m_realPosition = prePos;
- }
-
- } else if (ANIMSTYLE.starts_with("popin")) {
- float minPerc = 0.f;
- if (ANIMSTYLE.find("%") != std::string::npos) {
- try {
- auto percstr = ANIMSTYLE.substr(ANIMSTYLE.find_last_of(' '));
- minPerc = std::stoi(percstr.substr(0, percstr.length() - 1));
- } catch (std::exception& e) {
- ; // oops
- }
- }
-
- minPerc *= 0.01;
-
- const auto GOALSIZE = (m_geometry.size() * minPerc).clamp({5, 5});
- const auto GOALPOS = m_geometry.pos() + (m_geometry.size() - GOALSIZE) / 2.f;
-
- m_alpha->setValueAndWarp(in ? 0.f : 1.f);
- *m_alpha = in ? 1.f : 0.f;
-
- if (in) {
- m_realSize->setValueAndWarp(GOALSIZE);
- m_realPosition->setValueAndWarp(GOALPOS);
- *m_realSize = m_geometry.size();
- *m_realPosition = m_geometry.pos();
- } else {
- m_realSize->setValueAndWarp(m_geometry.size());
- m_realPosition->setValueAndWarp(m_geometry.pos());
- *m_realSize = GOALSIZE;
- *m_realPosition = GOALPOS;
- }
- } else {
- // fade
- m_realPosition->setValueAndWarp(m_geometry.pos());
- m_realSize->setValueAndWarp(m_geometry.size());
- *m_alpha = in ? 1.f : 0.f;
- }
-
- if (!in)
- m_fadingOut = true;
-}
-
bool CLayerSurface::isFadedOut() {
if (!m_fadingOut)
return false;
diff --git a/src/desktop/LayerSurface.hpp b/src/desktop/LayerSurface.hpp
index c59e2fd2..be32a778 100644
--- a/src/desktop/LayerSurface.hpp
+++ b/src/desktop/LayerSurface.hpp
@@ -18,7 +18,6 @@ class CLayerSurface {
~CLayerSurface();
void applyRules();
- void startAnimation(bool in, bool instant = false);
bool isFadedOut();
int popupsCount();
diff --git a/src/desktop/Popup.cpp b/src/desktop/Popup.cpp
index e7a60af2..c3794c6c 100644
--- a/src/desktop/Popup.cpp
+++ b/src/desktop/Popup.cpp
@@ -6,7 +6,7 @@
#include "../protocols/XDGShell.hpp"
#include "../protocols/core/Compositor.hpp"
#include "../managers/SeatManager.hpp"
-#include "../managers/AnimationManager.hpp"
+#include "../managers/animation/AnimationManager.hpp"
#include "../desktop/LayerSurface.hpp"
#include "../managers/input/InputManager.hpp"
#include "../render/Renderer.hpp"
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index f9857438..95651b7b 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -14,7 +14,7 @@
#include "../config/ConfigValue.hpp"
#include "../config/ConfigManager.hpp"
#include "../managers/TokenManager.hpp"
-#include "../managers/AnimationManager.hpp"
+#include "../managers/animation/AnimationManager.hpp"
#include "../managers/ANRManager.hpp"
#include "../protocols/XDGShell.hpp"
#include "../protocols/core/Compositor.hpp"
diff --git a/src/desktop/Workspace.cpp b/src/desktop/Workspace.cpp
index 1782950a..a9820635 100644
--- a/src/desktop/Workspace.cpp
+++ b/src/desktop/Workspace.cpp
@@ -2,7 +2,7 @@
#include "../Compositor.hpp"
#include "../config/ConfigValue.hpp"
#include "config/ConfigManager.hpp"
-#include "managers/AnimationManager.hpp"
+#include "managers/animation/AnimationManager.hpp"
#include "../managers/EventManager.hpp"
#include "../managers/HookSystemManager.hpp"
@@ -75,119 +75,6 @@ CWorkspace::~CWorkspace() {
m_events.destroy.emit();
}
-void CWorkspace::startAnim(bool in, bool left, bool instant) {
- if (!instant) {
- const std::string ANIMNAME = std::format("{}{}", m_isSpecialWorkspace ? "specialWorkspace" : "workspaces", in ? "In" : "Out");
-
- m_alpha->setConfig(g_pConfigManager->getAnimationPropertyConfig(ANIMNAME));
- m_renderOffset->setConfig(g_pConfigManager->getAnimationPropertyConfig(ANIMNAME));
- }
-
- const auto ANIMSTYLE = m_alpha->getStyle();
- static auto PWORKSPACEGAP = CConfigValue<Hyprlang::INT>("general:gaps_workspaces");
-
- // set floating windows offset callbacks
- m_renderOffset->setUpdateCallback([&](auto) {
- for (auto const& w : g_pCompositor->m_windows) {
- if (!validMapped(w) || w->workspaceID() != m_id)
- continue;
-
- w->onWorkspaceAnimUpdate();
- };
- });
-
- if (ANIMSTYLE.starts_with("slidefade")) {
- const auto PMONITOR = m_monitor.lock();
- float movePerc = 100.f;
-
- if (ANIMSTYLE.find('%') != std::string::npos) {
- try {
- auto percstr = ANIMSTYLE.substr(ANIMSTYLE.find_last_of(' ') + 1);
- movePerc = std::stoi(percstr.substr(0, percstr.length() - 1));
- } catch (std::exception& e) { Debug::log(ERR, "Error in startAnim: invalid percentage"); }
- }
-
- m_alpha->setValueAndWarp(1.f);
- m_renderOffset->setValueAndWarp(Vector2D(0, 0));
-
- if (ANIMSTYLE.starts_with("slidefadevert")) {
- if (in) {
- m_alpha->setValueAndWarp(0.f);
- m_renderOffset->setValueAndWarp(Vector2D(0.0, (left ? PMONITOR->m_size.y : -PMONITOR->m_size.y) * (movePerc / 100.f)));
- *m_alpha = 1.f;
- *m_renderOffset = Vector2D(0, 0);
- } else {
- m_alpha->setValueAndWarp(1.f);
- *m_alpha = 0.f;
- *m_renderOffset = Vector2D(0.0, (left ? -PMONITOR->m_size.y : PMONITOR->m_size.y) * (movePerc / 100.f));
- }
- } else {
- if (in) {
- m_alpha->setValueAndWarp(0.f);
- m_renderOffset->setValueAndWarp(Vector2D((left ? PMONITOR->m_size.x : -PMONITOR->m_size.x) * (movePerc / 100.f), 0.0));
- *m_alpha = 1.f;
- *m_renderOffset = Vector2D(0, 0);
- } else {
- m_alpha->setValueAndWarp(1.f);
- *m_alpha = 0.f;
- *m_renderOffset = Vector2D((left ? -PMONITOR->m_size.x : PMONITOR->m_size.x) * (movePerc / 100.f), 0.0);
- }
- }
- } else if (ANIMSTYLE == "fade") {
- m_renderOffset->setValueAndWarp(Vector2D(0, 0)); // fix a bug, if switching from slide -> fade.
-
- if (in) {
- m_alpha->setValueAndWarp(0.f);
- *m_alpha = 1.f;
- } else {
- m_alpha->setValueAndWarp(1.f);
- *m_alpha = 0.f;
- }
- } else if (ANIMSTYLE == "slidevert") {
- // fallback is slide
- const auto PMONITOR = m_monitor.lock();
- const auto YDISTANCE = PMONITOR->m_size.y + *PWORKSPACEGAP;
-
- m_alpha->setValueAndWarp(1.f); // fix a bug, if switching from fade -> slide.
-
- if (in) {
- m_renderOffset->setValueAndWarp(Vector2D(0.0, left ? YDISTANCE : -YDISTANCE));
- *m_renderOffset = Vector2D(0, 0);
- } else {
- *m_renderOffset = Vector2D(0.0, left ? -YDISTANCE : YDISTANCE);
- }
- } else {
- // fallback is slide
- const auto PMONITOR = m_monitor.lock();
- const auto XDISTANCE = PMONITOR->m_size.x + *PWORKSPACEGAP;
-
- m_alpha->setValueAndWarp(1.f); // fix a bug, if switching from fade -> slide.
-
- if (in) {
- m_renderOffset->setValueAndWarp(Vector2D(left ? XDISTANCE : -XDISTANCE, 0.0));
- *m_renderOffset = Vector2D(0, 0);
- } else {
- *m_renderOffset = Vector2D(left ? -XDISTANCE : XDISTANCE, 0.0);
- }
- }
-
- if (m_isSpecialWorkspace) {
- // required for open/close animations
- if (in) {
- m_alpha->setValueAndWarp(0.f);
- *m_alpha = 1.f;
- } else {
- m_alpha->setValueAndWarp(1.f);
- *m_alpha = 0.f;
- }
- }
-
- if (instant) {
- m_renderOffset->warp();
- m_alpha->warp();
- }
-}
-
PHLWINDOW CWorkspace::getLastFocusedWindow() {
if (!validMapped(m_lastFocusedWindow) || m_lastFocusedWindow->workspaceID() != m_id)
return nullptr;
diff --git a/src/desktop/Workspace.hpp b/src/desktop/Workspace.hpp
index a6074843..72bc3a67 100644
--- a/src/desktop/Workspace.hpp
+++ b/src/desktop/Workspace.hpp
@@ -60,7 +60,6 @@ class CWorkspace {
// Inert: destroyed and invalid. If this is true, release the ptr you have.
bool inert();
- void startAnim(bool in, bool left, bool instant = false);
MONITORID monitorID();
PHLWINDOW getLastFocusedWindow();
void rememberPrevWorkspace(const PHLWORKSPACE& prevWorkspace);
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-03 20:09:15 +0000