From 776d2b75b4fd0cb9b5920c09aba09d49d14c76f4 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Wed, 6 May 2026 19:38:25 +1000
Subject: [PATCH] feat: utils margin ignore border

---
 modules/utilities/Wrapper.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml
index 138fd16d..4ad98670 100644
--- a/modules/utilities/Wrapper.qml
+++ b/modules/utilities/Wrapper.qml
@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
+import Caelestia
 import Caelestia.Config
 import qs.components
 import qs.modules.sidebar as Sidebar
@@ -24,12 +25,13 @@ Item {
         reloadableId: "utilities"
     }
     readonly property bool shouldBeActive: visibilities.sidebar || (visibilities.utilities && Config.utilities.enabled && !(visibilities.session && Config.session.enabled))
+    readonly property real totalPadding: content.anchors.margins + CUtils.clamp(content.anchors.margins - Config.border.thickness, 0, content.anchors.margins)
     property real offsetScale: shouldBeActive ? 0 : 1
     property real sidebarLerp
 
     visible: offsetScale < 1
     anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
-    implicitHeight: content.implicitHeight + content.anchors.margins * 2
+    implicitHeight: content.implicitHeight + totalPadding
     implicitWidth: sidebar.width * (1 - sidebar.offsetScale) * horizontalStretch * sidebarLerp + Tokens.sizes.utilities.width * (1 - sidebarLerp)
     opacity: 1 - offsetScale
 
@@ -78,7 +80,7 @@ Item {
         active: root.shouldBeActive || root.visible
 
         sourceComponent: Content {
-            implicitWidth: root.implicitWidth - content.anchors.margins * 2
+            implicitWidth: root.implicitWidth - root.totalPadding
             props: root.props
             visibilities: root.visibilities
             popouts: root.popouts