Updates for Hyprland v0.46.0

dawsers · Dec 17, 2024 · 3c5e2f7 · 3c5e2f7
1 parent 9f7d9d7
commit 3c5e2f7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/functions.cpp b/src/functions.cpp
@@ -1,7 +1,8 @@
 #include "functions.h"
-#include "scroller.h"
 #include "dispatchers.h"
 
+#include <hyprland/src/Compositor.hpp>
+
 SDispatchResult this_moveFocusTo(std::string args)
 {
     dispatchers::dispatch_movefocus(args);

diff --git a/src/functions.h b/src/functions.h
@@ -1,6 +1,7 @@
 #ifndef SCROLLER_FUNCTIONS_H
 #define SCROLLER_FUNCTIONS_H
 
+#include <hyprland/src/helpers/Timer.hpp>
 #include <hyprland/src/desktop/Workspace.hpp>
 #include <hyprland/src/managers/KeybindManager.hpp>
 

diff --git a/src/scroller.cpp b/src/scroller.cpp
@@ -298,11 +298,11 @@ void ScrollerLayout::onWindowCreatedTiling(PHLWINDOW window, eDirection)
 
     // Check window rules
     for (auto &r: window->m_vMatchedRules) {
-        if (r.szRule.starts_with("plugin:scroller:group")) {
-            const auto name = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
+        if (r->szRule.starts_with("plugin:scroller:group")) {
+            const auto name = r->szRule.substr(r->szRule.find_first_of(' ') + 1);
             s->move_active_window_to_group(name);
-        } else if (r.szRule.starts_with("plugin:scroller:alignwindow")) {
-            const auto dir = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
+        } else if (r->szRule.starts_with("plugin:scroller:alignwindow")) {
+            const auto dir = r->szRule.substr(r->szRule.find_first_of(' ') + 1);
             if (dir == "l" || dir == "left") {
                 s->align_column(Direction::Left);
             } else if (dir == "r" || dir == "right") {
@@ -316,8 +316,8 @@ void ScrollerLayout::onWindowCreatedTiling(PHLWINDOW window, eDirection)
             } else if (dir == "m" || dir == "middle") {
                 s->align_column(Direction::Middle);
             }
-        } else if (r.szRule.starts_with("plugin:scroller:marksadd")) {
-            const auto mark_name = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
+        } else if (r->szRule.starts_with("plugin:scroller:marksadd")) {
+            const auto mark_name = r->szRule.substr(r->szRule.find_first_of(' ') + 1);
             marks.add(window, mark_name);
         }
     }

diff --git a/src/sizes.cpp b/src/sizes.cpp
@@ -83,8 +83,8 @@ ConfigurationSize ScrollerSizes::get_window_default_height(PHLWINDOW window)
 {
     // Check window rules
     for (auto &r: window->m_vMatchedRules) {
-        if (r.szRule.starts_with("plugin:scroller:windowheight")) {
-            const auto window_height = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
+        if (r->szRule.starts_with("plugin:scroller:windowheight")) {
+            const auto window_height = r->szRule.substr(r->szRule.find_first_of(' ') + 1);
             return get_window_default_height_fron_string(window_height);
         }
     }
@@ -103,8 +103,8 @@ ConfigurationSize ScrollerSizes::get_column_default_width(PHLWINDOW window)
 {
     // Check window rules
     for (auto &r: window->m_vMatchedRules) {
-        if (r.szRule.starts_with("plugin:scroller:columnwidth")) {
-            const auto column_width = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
+        if (r->szRule.starts_with("plugin:scroller:columnwidth")) {
+            const auto column_width = r->szRule.substr(r->szRule.find_first_of(' ') + 1);
             return get_column_default_width_fron_string(column_width);
         }
     }