fixes

Author: vaxerski

src/desktop/reserved/ReservedArea.cpp

@@ -1,4 +1,5 @@
 #include "ReservedArea.hpp"
+#include "../../macros.hpp"
 
 using namespace Desktop;
 
@@ -13,6 +14,18 @@ CReservedArea::CReservedArea(double top, double right, double bottom, double lef
     calculate();
 }
 
+CReservedArea::CReservedArea(const CBox& parent, const CBox& child) {
+    ASSERT(!parent.empty() && !child.empty());
+
+    ASSERT(parent.containsPoint(child.pos() + Vector2D{0.0001, 0.0001}));
+    ASSERT(parent.containsPoint(child.pos() + child.size() - Vector2D{0.0001, 0.0001}));
+
+    m_initialTopLeft     = child.pos() - parent.pos();
+    m_initialBottomRight = (parent.pos() + parent.size()) - (child.pos() + child.size());
+
+    calculate();
+}
+
 void CReservedArea::calculate() {
     m_bottomRight = m_initialBottomRight;
     m_topLeft     = m_initialTopLeft;
@@ -70,3 +83,7 @@ void CReservedArea::addType(eReservedDynamicType t, const Vector2D& topLeft, con
     ref.bottomRight += bottomRight;
     calculate();
 }
+
+void CReservedArea::addType(eReservedDynamicType t, const CReservedArea& area) {
+    addType(t, {area.left(), area.top()}, {area.right(), area.bottom()});
+}

src/desktop/reserved/ReservedArea.hpp

@@ -16,13 +16,15 @@ namespace Desktop {
         CReservedArea() = default;
         CReservedArea(const Vector2D& tl, const Vector2D& br);
         CReservedArea(double top, double right, double bottom, double left);
+        CReservedArea(const CBox& parent, const CBox& child);
         ~CReservedArea() = default;
 
         CBox   apply(const CBox& other) const;
         void   applyip(CBox& other) const;
 
         void   resetType(eReservedDynamicType);
         void   addType(eReservedDynamicType, const Vector2D& topLeft, const Vector2D& bottomRight);
+        void   addType(eReservedDynamicType, const CReservedArea& area);
 
         double left() const;
         double right() const;

src/render/Renderer.cpp

@@ -1856,8 +1856,7 @@ void CHyprRenderer::arrangeLayersForMonitor(const MONITORID& monitor) {
     for (auto const& la : PMONITOR->m_layerSurfaceLayers)
         arrangeLayerArray(PMONITOR, la, false, &usableArea);
 
-    PMONITOR->m_reservedArea.addType(Desktop::RESERVED_DYNAMIC_TYPE_LS, Vector2D{usableArea.x, usableArea.y} - PMONITOR->m_position,
-                                     ORIGINAL_USABLE_AREA.size() - Vector2D{usableArea.w, usableArea.h});
+    PMONITOR->m_reservedArea.addType(Desktop::RESERVED_DYNAMIC_TYPE_LS, Desktop::CReservedArea{ORIGINAL_USABLE_AREA, usableArea});
 
     // damage the monitor if can
     damageMonitor(PMONITOR);

tests/desktop/Reserved.cpp

@@ -28,4 +28,11 @@ TEST(Desktop, reservedArea) {
     EXPECT_EQ(box.y, 1000 + 30 + 20);
     EXPECT_EQ(box.w, 1000 - 20 - 40 - 10 - 30);
     EXPECT_EQ(box.h, 1000 - 30 - 50 - 20 - 40);
+
+    Desktop::CReservedArea b{CBox{10, 10, 1000, 1000}, CBox{20, 30, 900, 900}};
+
+    EXPECT_EQ(b.left(), 20 - 10);
+    EXPECT_EQ(b.top(), 30 - 10);
+    EXPECT_EQ(b.right(), 1010 - 920);
+    EXPECT_EQ(b.bottom(), 1010 - 930);
 }