stuf

Author: vaxerski

hyprtester/src/tests/main/window.cpp

@@ -161,13 +161,13 @@ static bool test() {
         const int    MONITOR_H     = 1080;
 
         const float  totalAvailableHeight   = MONITOR_H - (GAPSOUT * 2);
-        const int    HEIGHT                 = std::round(totalAvailableHeight) - BORDERS;
+        const int    HEIGHT                 = std::floor(totalAvailableHeight) - BORDERS;
         const float  availableWidthForSplit = MONITOR_W - (GAPSOUT * 2) - GAPSIN;
 
         auto         calculateFinalWidth = [&](double boxWidth, bool isLeftWindow) {
             double gapLeft  = isLeftWindow ? GAPSOUT : GAPSIN;
             double gapRight = isLeftWindow ? GAPSIN : GAPSOUT;
-            return std::round(boxWidth - gapLeft - gapRight - BORDERS);
+            return std::floor(boxWidth - gapLeft - gapRight - BORDERS);
         };
 
         double       geomBoxWidthA_R1 = (availableWidthForSplit * INITIAL_RATIO / 2.0) + GAPSOUT + (GAPSIN / 2.0);

src/layout/IHyprLayout.cpp

@@ -500,16 +500,17 @@ void IHyprLayout::performSnap(Vector2D& sourcePos, Vector2D& sourceSize, PHLWIND
         const auto*  EXTENTDIFF = *SNAPBORDEROVERLAP ? &EXTENTS : &EXTENTNONE;
         const auto   MON        = DRAGGINGWINDOW->m_monitor.lock();
 
-        const auto*  GAPSOUT   = *SNAPRESPECTGAPS ? sc<CCssGapData*>(PGAPSOUT.ptr()->getData()) : &GAPSNONE;
-        const auto   WORK_AREA = Desktop::CReservedArea{GAPSOUT->m_top, GAPSOUT->m_right, GAPSOUT->m_bottom, GAPSOUT->m_left}.apply(MON->logicalBoxMinusReserved());
+        const auto*  GAPSOUT       = *SNAPRESPECTGAPS ? sc<CCssGapData*>(PGAPSOUT.ptr()->getData()) : &GAPSNONE;
+        const auto   RAW_WORK_AREA = MON->logicalBoxMinusReserved();
+        const auto   WORK_AREA     = Desktop::CReservedArea{GAPSOUT->m_top, GAPSOUT->m_right, GAPSOUT->m_bottom, GAPSOUT->m_left}.apply(RAW_WORK_AREA);
 
         SRange       monX = {WORK_AREA.x, WORK_AREA.x + WORK_AREA.w};
         SRange       monY = {WORK_AREA.y, WORK_AREA.y + WORK_AREA.h};
 
-        const bool   HAS_LEFT   = WORK_AREA.x != MON->m_position.x;
-        const bool   HAS_TOP    = WORK_AREA.y != MON->m_position.y;
-        const bool   HAS_BOTTOM = WORK_AREA.y + WORK_AREA.h != MON->m_position.y + MON->m_size.y;
-        const bool   HAS_RIGHT  = WORK_AREA.x + WORK_AREA.w != MON->m_position.x + MON->m_size.y;
+        const bool   HAS_LEFT   = RAW_WORK_AREA.x != MON->m_position.x;
+        const bool   HAS_TOP    = RAW_WORK_AREA.y != MON->m_position.y;
+        const bool   HAS_BOTTOM = RAW_WORK_AREA.y + RAW_WORK_AREA.h != MON->m_position.y + MON->m_size.y;
+        const bool   HAS_RIGHT  = RAW_WORK_AREA.x + RAW_WORK_AREA.w != MON->m_position.x + MON->m_size.y;
 
         if (CORNER & (CORNER_TOPLEFT | CORNER_BOTTOMLEFT) &&
             ((HAS_LEFT && canSnap(sourceX.start, monX.start, GAPSIZE)) || canSnap(sourceX.start, (monX.start -= MON->m_reservedArea.left() + EXTENTDIFF->topLeft.x), GAPSIZE))) {

src/render/Renderer.cpp

@@ -1834,7 +1834,7 @@ void CHyprRenderer::arrangeLayerArray(PHLMONITOR pMonitor, const std::vector<PHL
 }
 
 void CHyprRenderer::arrangeLayersForMonitor(const MONITORID& monitor) {
-    const auto  PMONITOR = g_pCompositor->getMonitorFromID(monitor);
+    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitor);
 
     if (!PMONITOR)
         return;