Diff
1diff --git a/flake.lock b/flake.lock
2index 8f52044ac553161059f6fa061c1bf7500fa0a81f..12ac27d5c638ba40a467beb1b9c528b27acfbc37 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -145,17 +145,17 @@
6 "xdph": "xdph"
7 },
8 "locked": {
9- "lastModified": 1736542519,
10- "narHash": "sha256-gGxZNtLLqDPtXB5OZbEltfLW5ZzB6zXGobcuKPt02lg=",
11+ "lastModified": 1737190765,
12+ "narHash": "sha256-PLlikEedyXErmdkuIYPTY7YA3LVRlb+ZYM9YALCi7MM=",
13 "owner": "hyprwm",
14 "repo": "Hyprland",
15- "rev": "cef09fbfe6624d2133d81be863bd48bcfc5939d3",
16+ "rev": "d01756c1f41977e852eba1cbf45c0149ae0f08e8",
17 "type": "github"
18 },
19 "original": {
20 "owner": "hyprwm",
21 "repo": "Hyprland",
22- "rev": "cef09fbfe6624d2133d81be863bd48bcfc5939d3",
23+ "rev": "d01756c1f41977e852eba1cbf45c0149ae0f08e8",
24 "type": "github"
25 }
26 },
27diff --git a/flake.nix b/flake.nix
28index 154b2cc97284fe9adc2e97516b711801f0573622..a502dc45ade44c31809c3de1e069492fded99b53 100644
29--- a/flake.nix
30+++ b/flake.nix
31@@ -1,6 +1,6 @@
32 {
33 inputs = {
34- hyprland.url = "github:hyprwm/Hyprland?rev=cef09fbfe6624d2133d81be863bd48bcfc5939d3";
35+ hyprland.url = "github:hyprwm/Hyprland?rev=d01756c1f41977e852eba1cbf45c0149ae0f08e8";
36 };
37
38 outputs = { self, hyprland, ... }: let
39diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
40index 8d00f61978748f0fb6d4aa46339e717d72c1cb76..7c5ac6f63ba4358504d6e3a82df214e17ea6b40f 100644
41--- a/src/Hy3Layout.cpp
42+++ b/src/Hy3Layout.cpp
43@@ -3,11 +3,14 @@
44
45 #include <dlfcn.h>
46 #include <hyprland/src/Compositor.hpp>
47+#include <hyprland/src/config/ConfigManager.hpp>
48 #include <hyprland/src/desktop/DesktopTypes.hpp>
49 #include <hyprland/src/desktop/Workspace.hpp>
50 #include <hyprland/src/managers/PointerManager.hpp>
51 #include <hyprland/src/managers/SeatManager.hpp>
52+#include <hyprland/src/managers/input/InputManager.hpp>
53 #include <hyprland/src/plugins/PluginAPI.hpp>
54+#include <hyprland/src/plugins/PluginSystem.hpp>
55 #include <ranges>
56
57 #include "Hy3Layout.hpp"
58@@ -1049,7 +1052,12 @@ void changeNodeWorkspaceRecursive(Hy3Node& node, const PHLWORKSPACE& workspace)
59 }
60 }
61
62-void Hy3Layout::moveNodeToWorkspace(const PHLWORKSPACE& origin, std::string wsname, bool follow, bool warp) {
63+void Hy3Layout::moveNodeToWorkspace(
64+ const PHLWORKSPACE& origin,
65+ std::string wsname,
66+ bool follow,
67+ bool warp
68+) {
69 auto target = getWorkspaceIDNameFromString(operationWorkspaceForName(wsname));
70
71 if (target.id == WORKSPACE_INVALID) {
72diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
73index 5bede0d2878025cea4df72c77c85d8777ed66b82..9e477c90ae221cba9ac1d72156edab07d3b41373 100644
74--- a/src/Hy3Node.cpp
75+++ b/src/Hy3Node.cpp
76@@ -4,6 +4,7 @@
77
78 #include <bits/ranges_util.h>
79 #include <hyprland/src/Compositor.hpp>
80+#include <hyprland/src/config/ConfigManager.hpp>
81 #include <hyprland/src/defines.hpp>
82 #include <hyprland/src/plugins/PluginAPI.hpp>
83 #include <hyprutils/math/Box.hpp>
84diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
85index f42b4e01f78988a56fb03290cec3004e33b1bde1..234cd725f0303d6aaa4f23168f86dfe159c9c9bc 100644
86--- a/src/TabGroup.cpp
87+++ b/src/TabGroup.cpp
88@@ -3,9 +3,12 @@
89 #include <GLES2/gl2.h>
90 #include <cairo/cairo.h>
91 #include <hyprland/src/Compositor.hpp>
92+#include <hyprland/src/config/ConfigManager.hpp>
93 #include <hyprland/src/desktop/DesktopTypes.hpp>
94 #include <hyprland/src/desktop/Workspace.hpp>
95 #include <hyprland/src/helpers/Color.hpp>
96+#include <hyprland/src/managers/AnimationManager.hpp>
97+#include <hyprland/src/managers/input/InputManager.hpp>
98 #include <hyprland/src/render/OpenGL.hpp>
99 #include <hyprland/src/render/Texture.hpp>
100 #include <hyprutils/math/Box.hpp>
101@@ -15,7 +18,6 @@
102 #include <pixman.h>
103
104 #include "globals.hpp"
105-#include "log.hpp"
106 #include "render.hpp"
107
108 // This is a workaround CHyprColor not having working arithmetic operator...
109diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
110index e7fc74d6c254ae950f6408f33ec454a0bd850637..0df213a21fac32d57f98c60b93eb58186fb776ac 100644
111--- a/src/dispatchers.cpp
112+++ b/src/dispatchers.cpp
113@@ -2,6 +2,7 @@
114
115 #include <hyprland/src/Compositor.hpp>
116 #include <hyprland/src/desktop/DesktopTypes.hpp>
117+#include <hyprland/src/managers/LayoutManager.hpp>
118 #include <hyprland/src/plugins/PluginAPI.hpp>
119 #include <hyprutils/string/String.hpp>
120
121@@ -158,8 +159,8 @@ void dispatch_move_to_workspace(std::string value) {
122 auto follow = args[1] == "follow";
123
124 auto warp_cursor =
125- follow
126- && ((!*no_cursor_warps && args[2] != "nowarp") || (*no_cursor_warps && args[2] == "warp"));
127+ follow
128+ && ((!*no_cursor_warps && args[2] != "nowarp") || (*no_cursor_warps && args[2] == "warp"));
129
130 g_Hy3Layout->moveNodeToWorkspace(origin_workspace, workspace, follow, warp_cursor);
131 }
132diff --git a/src/render.cpp b/src/render.cpp
133index 73b9a427260b0d23dd6302cdb6ff88ee892785f4..4de21fa12c91239313f4cf855bb96a83aed6a6f3 100644
134--- a/src/render.cpp
135+++ b/src/render.cpp
136@@ -3,10 +3,13 @@
137 #include <GLES2/gl2.h>
138 #include <hyprland/src/helpers/math/Math.hpp>
139 #include <hyprland/src/render/OpenGL.hpp>
140+#include <hyprutils/math/Box.hpp>
141 #include <hyprutils/math/Vector2D.hpp>
142
143 #include "shaders.hpp"
144
145+using Hyprutils::Math::CBox;
146+
147 void Hy3Render::renderTab(
148 const CBox& box,
149 float opacity,
150diff --git a/src/render.hpp b/src/render.hpp
151index f9aefe8fa4a2d5e7e2560b38c5665ddee608563e..be387202246cc0e429d49c2dcaaf1f439ee5eca6 100644
152--- a/src/render.hpp
153+++ b/src/render.hpp
154@@ -5,7 +5,7 @@
155 class Hy3Render {
156 public:
157 static void renderTab(
158- const CBox& box,
159+ const Hyprutils::Math::CBox& box,
160 float opacity,
161 bool blur,
162 const CHyprColor& fillColor,