From e45066d0741a1a4b9298a4c5ec43a5e57b059a4e Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sun, 31 Mar 2024 02:18:20 +0100
Subject: [PATCH] all: chase hyprland

---
 borders-plus-plus/borderDeco.cpp | 4 ++--
 borders-plus-plus/borderDeco.hpp | 2 +-
 hyprbars/barDeco.cpp             | 8 ++++----
 hyprbars/barDeco.hpp             | 2 +-
 hyprtrails/trail.cpp             | 2 +-
 hyprtrails/trail.hpp             | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/borders-plus-plus/borderDeco.cpp b/borders-plus-plus/borderDeco.cpp
index 87cf1f6..6bf13b8 100644
--- a/borders-plus-plus/borderDeco.cpp
+++ b/borders-plus-plus/borderDeco.cpp
@@ -60,7 +60,7 @@ std::string CBordersPlusPlus::getDisplayName() {
     return "Borders++";
 }
 
-void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
+void CBordersPlusPlus::draw(CMonitor* pMonitor, float a) {
     if (!g_pCompositor->windowValidMapped(m_pWindow))
         return;
 
@@ -88,7 +88,7 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a, const Vector2D& offset)
     const auto ORIGINALROUND = rounding == 0 ? 0 : m_pWindow->rounding() * pMonitor->scale + **PBORDERSIZE;
     CBox       fullBox       = {m_vLastWindowPos.x, m_vLastWindowPos.y, m_vLastWindowSize.x, m_vLastWindowSize.y};
 
-    fullBox.translate(offset - pMonitor->vecPosition + WORKSPACEOFFSET).scale(pMonitor->scale);
+    fullBox.translate(m_pWindow->m_vFloatingOffset - pMonitor->vecPosition + WORKSPACEOFFSET).scale(pMonitor->scale);
 
     double fullThickness = 0;
 
diff --git a/borders-plus-plus/borderDeco.hpp b/borders-plus-plus/borderDeco.hpp
index 1193a89..b296c67 100644
--- a/borders-plus-plus/borderDeco.hpp
+++ b/borders-plus-plus/borderDeco.hpp
@@ -13,7 +13,7 @@ class CBordersPlusPlus : public IHyprWindowDecoration {
 
     virtual void                       onPositioningReply(const SDecorationPositioningReply& reply);
 
-    virtual void                       draw(CMonitor*, float a, const Vector2D& offset);
+    virtual void                       draw(CMonitor*, float a);
 
     virtual eDecorationType            getDecorationType();
 
diff --git a/hyprbars/barDeco.cpp b/hyprbars/barDeco.cpp
index 2553f52..1c0d0e5 100644
--- a/hyprbars/barDeco.cpp
+++ b/hyprbars/barDeco.cpp
@@ -376,7 +376,7 @@ void CHyprBar::renderBarButtonsText(CBox* barBox, const float scale, const float
     }
 }
 
-void CHyprBar::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
+void CHyprBar::draw(CMonitor* pMonitor, float a) {
     if (!g_pCompositor->windowValidMapped(m_pWindow))
         return;
 
@@ -415,7 +415,7 @@ void CHyprBar::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
     CBox       titleBarBox = {DECOBOX.x - pMonitor->vecPosition.x, DECOBOX.y - pMonitor->vecPosition.y, DECOBOX.w,
                               DECOBOX.h + ROUNDING * 3 /* to fill the bottom cuz we can't disable rounding there */};
 
-    titleBarBox.translate(offset).scale(pMonitor->scale).round();
+    titleBarBox.translate(m_pWindow->m_vFloatingOffset).scale(pMonitor->scale).round();
 
     if (titleBarBox.w < 1 || titleBarBox.h < 1)
         return;
@@ -424,8 +424,8 @@ void CHyprBar::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
 
     if (ROUNDING) {
         // the +1 is a shit garbage temp fix until renderRect supports an alpha matte
-        CBox windowBox = {m_pWindow->m_vRealPosition.value().x + offset.x - pMonitor->vecPosition.x + 1,
-                          m_pWindow->m_vRealPosition.value().y + offset.y - pMonitor->vecPosition.y + 1, m_pWindow->m_vRealSize.value().x - 2,
+        CBox windowBox = {m_pWindow->m_vRealPosition.value().x + m_pWindow->m_vFloatingOffset.x - pMonitor->vecPosition.x + 1,
+                          m_pWindow->m_vRealPosition.value().y + m_pWindow->m_vFloatingOffset.y - pMonitor->vecPosition.y + 1, m_pWindow->m_vRealSize.value().x - 2,
                           m_pWindow->m_vRealSize.value().y - 2};
 
         if (windowBox.w < 1 || windowBox.h < 1)
diff --git a/hyprbars/barDeco.hpp b/hyprbars/barDeco.hpp
index 06ae062..e93bb10 100644
--- a/hyprbars/barDeco.hpp
+++ b/hyprbars/barDeco.hpp
@@ -15,7 +15,7 @@ class CHyprBar : public IHyprWindowDecoration {
 
     virtual void                       onPositioningReply(const SDecorationPositioningReply& reply);
 
-    virtual void                       draw(CMonitor*, float a, const Vector2D& offset);
+    virtual void                       draw(CMonitor*, float a);
 
     virtual eDecorationType            getDecorationType();
 
diff --git a/hyprtrails/trail.cpp b/hyprtrails/trail.cpp
index f2ddc4a..e1a1881 100644
--- a/hyprtrails/trail.cpp
+++ b/hyprtrails/trail.cpp
@@ -76,7 +76,7 @@ Vector2D vecForBezierT(const float& t, const std::vector<Vector2D>& verts) {
         return pts[0];
 }
 
-void CTrail::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
+void CTrail::draw(CMonitor* pMonitor, float a) {
     if (!g_pCompositor->windowValidMapped(m_pWindow))
         return;
 
diff --git a/hyprtrails/trail.hpp b/hyprtrails/trail.hpp
index 59cfd1c..3a3e18d 100644
--- a/hyprtrails/trail.hpp
+++ b/hyprtrails/trail.hpp
@@ -37,7 +37,7 @@ class CTrail : public IHyprWindowDecoration {
 
     virtual void                       onPositioningReply(const SDecorationPositioningReply& reply);
 
-    virtual void                       draw(CMonitor*, float a, const Vector2D& offset);
+    virtual void                       draw(CMonitor*, float a);
 
     virtual eDecorationType            getDecorationType();