dispatchers: scaleactive fix for some popup locations

hyprwm · Feb 25, 2025 · 0d3ccec · 0d3ccec
1 parent 6ba4e54
commit 0d3ccec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/desktop/Popup.cpp b/src/desktop/Popup.cpp
@@ -226,7 +226,11 @@ void CPopup::reposition() {
     if (!PMONITOR)
         return;
 
-    CBox box = {PMONITOR->vecPosition.x, PMONITOR->vecPosition.y, PMONITOR->vecSize.x, PMONITOR->vecSize.y};
+    CBox       box   = {PMONITOR->vecPosition.x, PMONITOR->vecPosition.y, PMONITOR->vecSize.x, PMONITOR->vecSize.y};
+    const auto scale = getContentScale();
+    box.w            = COORDS.x + (box.w - COORDS.x) * scale;
+    box.h            = COORDS.y + (box.h - COORDS.y) * scale;
+
     m_pResource->applyPositioning(box, COORDS);
 }
 

diff --git a/src/render/pass/SurfacePassElement.cpp b/src/render/pass/SurfacePassElement.cpp
@@ -179,10 +179,10 @@ CBox CSurfacePassElement::getTexBox() {
     }
 
     if (data.squishOversized) {
-        if (data.localPos.x + windowBox.width > data.w)
-            windowBox.width = data.w - data.localPos.x;
-        if (data.localPos.y + windowBox.height > data.h)
-            windowBox.height = data.h - data.localPos.y;
+        if (data.localPos.x / data.contentScale + windowBox.width > data.w)
+            windowBox.width = data.w - data.localPos.x / data.contentScale;
+        if (data.localPos.y / data.contentScale + windowBox.height > data.h)
+            windowBox.height = data.h - data.localPos.y / data.contentScale;
     }
 
     return windowBox;