From bc86afea7e177a7ad4335737417fc0e468698dc4 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sat, 27 Jul 2024 13:43:01 -0700
Subject: xdg-shell: completely rewrite xdg-positioner (#7067)

This implementation actually works.
---
 src/protocols/XDGShell.hpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/protocols/XDGShell.hpp')

diff --git a/src/protocols/XDGShell.hpp b/src/protocols/XDGShell.hpp
index da551718..e6812c38 100644
--- a/src/protocols/XDGShell.hpp
+++ b/src/protocols/XDGShell.hpp
@@ -4,10 +4,10 @@
 #include <vector>
 #include <cstdint>
 #include <optional>
+#include <hyprutils/math/Edges.hpp>
 #include "WaylandProtocol.hpp"
 #include "xdg-shell.hpp"
 #include "../helpers/math/Math.hpp"
-#include "../helpers/math/Math.hpp"
 #include "../helpers/signal/Signal.hpp"
 #include "types/SurfaceRole.hpp"
 
@@ -20,21 +20,24 @@ class CSeatGrab;
 class CWLSurfaceResource;
 
 struct SXDGPositionerState {
-    Vector2D             requestedSize;
-    CBox                 anchorRect;
-    xdgPositionerAnchor  anchor               = XDG_POSITIONER_ANCHOR_NONE;
-    xdgPositionerGravity gravity              = XDG_POSITIONER_GRAVITY_NONE;
-    uint32_t             constraintAdjustment = 0;
-    Vector2D             offset;
-    bool                 reactive = false;
-    Vector2D             parentSize;
+    Vector2D requestedSize;
+    CBox     anchorRect;
+    CEdges   anchor;
+    CEdges   gravity;
+    uint32_t constraintAdjustment = 0;
+    Vector2D offset;
+    bool     reactive = false;
+    Vector2D parentSize;
+
+    void     setAnchor(xdgPositionerAnchor edges);
+    void     setGravity(xdgPositionerGravity edges);
 };
 
 class CXDGPositionerRules {
   public:
     CXDGPositionerRules(SP<CXDGPositionerResource> positioner);
 
-    CBox getPosition(const CBox& constraint, const Vector2D& parentPos);
+    CBox getPosition(CBox constraint, const Vector2D& parentPos);
 
   private:
     SXDGPositionerState state;
-- 
cgit v1.2.3