Diff
1diff --git a/flake.lock b/flake.lock
2index a2ad6ea8be247ad77ea04873776b69902bd5afca..fa5d3decfcd3715d500d4cfc7589d9c9069c8659 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -20,11 +20,11 @@
6 ]
7 },
8 "locked": {
9- "lastModified": 1722347739,
10- "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
11+ "lastModified": 1724006173,
12+ "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=",
13 "owner": "hyprwm",
14 "repo": "aquamarine",
15- "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
16+ "rev": "7f8df01d4297b9068a9592400f16044602844f86",
17 "type": "github"
18 },
19 "original": {
20@@ -49,11 +49,11 @@
21 ]
22 },
23 "locked": {
24- "lastModified": 1721330371,
25- "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
26+ "lastModified": 1722623071,
27+ "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
28 "owner": "hyprwm",
29 "repo": "hyprcursor",
30- "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
31+ "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
32 "type": "github"
33 },
34 "original": {
35@@ -74,16 +74,16 @@
36 "xdph": "xdph"
37 },
38 "locked": {
39- "lastModified": 1723058230,
40- "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=",
41- "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
42- "revCount": 5069,
43+ "lastModified": 1724085862,
44+ "narHash": "sha256-qIPLv+MmTVZ0sjhx99EZhe/2aGzy5JOskmlqPd6DNFQ=",
45+ "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
46+ "revCount": 5115,
47 "submodules": true,
48 "type": "git",
49 "url": "https://github.com/hyprwm/Hyprland"
50 },
51 "original": {
52- "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
53+ "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
54 "submodules": true,
55 "type": "git",
56 "url": "https://github.com/hyprwm/Hyprland"
57@@ -157,11 +157,11 @@
58 ]
59 },
60 "locked": {
61- "lastModified": 1722098849,
62- "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
63+ "lastModified": 1722869141,
64+ "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
65 "owner": "hyprwm",
66 "repo": "hyprutils",
67- "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
68+ "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
69 "type": "github"
70 },
71 "original": {
72@@ -197,11 +197,11 @@
73 },
74 "nixpkgs": {
75 "locked": {
76- "lastModified": 1722185531,
77- "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
78+ "lastModified": 1723637854,
79+ "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
80 "owner": "NixOS",
81 "repo": "nixpkgs",
82- "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
83+ "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
84 "type": "github"
85 },
86 "original": {
87diff --git a/flake.nix b/flake.nix
88index 1a5258728ec44eaf91117f77b569d0e0437c2787..205c12ddb4e4ca699507d8d0c878a61e00ff5d21 100644
89--- a/flake.nix
90+++ b/flake.nix
91@@ -1,6 +1,6 @@
92 {
93 inputs = {
94- hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=9a09eac79b85c846e3a865a9078a3f8ff65a9259";
95+ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae";
96 };
97
98 outputs = { self, hyprland, ... }: let
99diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
100index d8d6b627ead7947e461a8d6bb134c14171f57004..2f6b55043b8c10cc582ef014b6e65f22c35e47f9 100644
101--- a/src/Hy3Layout.cpp
102+++ b/src/Hy3Layout.cpp
103@@ -358,7 +358,7 @@ bool Hy3Layout::isWindowTiled(PHLWINDOW window) {
104 return this->getNodeFromWindow(window) != nullptr;
105 }
106
107-void Hy3Layout::recalculateMonitor(const int& monitor_id) {
108+void Hy3Layout::recalculateMonitor(const MONITORID& monitor_id) {
109 hy3_log(LOG, "recalculating monitor {}", monitor_id);
110 const auto monitor = g_pCompositor->getMonitorFromID(monitor_id);
111 if (monitor == nullptr) return;
112diff --git a/src/Hy3Layout.hpp b/src/Hy3Layout.hpp
113index 4817188a3a8924f4907548bb263ff1e006f2c208..61d965d98177aca026ab0a2dd1edf8ba009121bc 100644
114--- a/src/Hy3Layout.hpp
115+++ b/src/Hy3Layout.hpp
116@@ -75,7 +75,7 @@ public:
117 void onWindowRemovedTiling(PHLWINDOW) override;
118 void onWindowFocusChange(PHLWINDOW) override;
119 bool isWindowTiled(PHLWINDOW) override;
120- void recalculateMonitor(const int& monitor_id) override;
121+ void recalculateMonitor(const MONITORID& monitor_id) override;
122 void recalculateWindow(PHLWINDOW) override;
123 void resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PHLWINDOW pWindow = nullptr)
124 override;