From fb15b7aa2a9bba0f0693f84d0c65d386942583f8 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Wed, 19 Jun 2024 16:20:06 +0200
Subject: core: Move to hyprutils for Math

Moves CRegion, CBox and Vector2D over to hyprutils.

Requires hyprutils>=0.1.4
---
 src/protocols/core/Compositor.cpp | 2 +-
 src/protocols/core/Compositor.hpp | 2 +-
 src/protocols/core/DataDevice.hpp | 2 +-
 src/protocols/core/Seat.hpp       | 2 +-
 src/protocols/core/Shm.hpp        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/protocols/core')

diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp
index 165da6ee..4bce3f58 100644
--- a/src/protocols/core/Compositor.cpp
+++ b/src/protocols/core/Compositor.cpp
@@ -421,7 +421,7 @@ CRegion CWLSurfaceResource::accumulateCurrentBufferDamage() {
 
     Vector2D trc = current.transform % 2 == 1 ? Vector2D{current.buffer->size.y, current.buffer->size.x} : current.buffer->size;
 
-    return surfaceDamage.scale(current.scale).transform(wlr_output_transform_invert(current.transform), trc.x, trc.y).add(current.bufferDamage);
+    return surfaceDamage.scale(current.scale).transform(wlTransformToHyprutils(wlr_output_transform_invert(current.transform)), trc.x, trc.y).add(current.bufferDamage);
 }
 
 CWLCompositorResource::CWLCompositorResource(SP<CWlCompositor> resource_) : resource(resource_) {
diff --git a/src/protocols/core/Compositor.hpp b/src/protocols/core/Compositor.hpp
index f50144bf..2f276719 100644
--- a/src/protocols/core/Compositor.hpp
+++ b/src/protocols/core/Compositor.hpp
@@ -14,7 +14,7 @@
 #include "../WaylandProtocol.hpp"
 #include "wayland.hpp"
 #include "../../helpers/signal/Signal.hpp"
-#include "../../helpers/Region.hpp"
+#include "../../helpers/math/Math.hpp"
 #include "../types/Buffer.hpp"
 #include "../types/SurfaceRole.hpp"
 
diff --git a/src/protocols/core/DataDevice.hpp b/src/protocols/core/DataDevice.hpp
index 5b31559f..22bb9376 100644
--- a/src/protocols/core/DataDevice.hpp
+++ b/src/protocols/core/DataDevice.hpp
@@ -15,7 +15,7 @@
 #include <wayland-server-protocol.h>
 #include "wayland.hpp"
 #include "../../helpers/signal/Signal.hpp"
-#include "../../helpers/Vector2D.hpp"
+#include "../../helpers/math/Math.hpp"
 #include "../types/DataDevice.hpp"
 
 class CWLDataDeviceResource;
diff --git a/src/protocols/core/Seat.hpp b/src/protocols/core/Seat.hpp
index 0b563b8f..09b36056 100644
--- a/src/protocols/core/Seat.hpp
+++ b/src/protocols/core/Seat.hpp
@@ -15,7 +15,7 @@
 #include <wayland-server-protocol.h>
 #include "wayland.hpp"
 #include "../../helpers/signal/Signal.hpp"
-#include "../../helpers/Vector2D.hpp"
+#include "../../helpers/math/Math.hpp"
 
 constexpr const char* HL_SEAT_NAME = "Hyprland";
 
diff --git a/src/protocols/core/Shm.hpp b/src/protocols/core/Shm.hpp
index 687e2031..70a8b208 100644
--- a/src/protocols/core/Shm.hpp
+++ b/src/protocols/core/Shm.hpp
@@ -13,7 +13,7 @@
 #include "../WaylandProtocol.hpp"
 #include "wayland.hpp"
 #include "../types/Buffer.hpp"
-#include "../../helpers/Vector2D.hpp"
+#include "../../helpers/math/Math.hpp"
 
 class CWLSHMPoolResource;
 
-- 
cgit v1.2.3