From e29be58790a5eebaadca0648486edb55dd8dd422 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Wed, 6 May 2026 19:34:44 +1000
Subject: [PATCH] feat: sidebar margins ignore border

---
 modules/dashboard/Content.qml | 3 ++-
 modules/drawers/Panels.qml    | 1 +
 modules/sidebar/Wrapper.qml   | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml
index d149a1ac..0a1e23c2 100644
--- a/modules/dashboard/Content.qml
+++ b/modules/dashboard/Content.qml
@@ -4,6 +4,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
+import Caelestia
 import Caelestia.Config
 import qs.components
 import qs.components.filedialog
@@ -57,7 +58,7 @@ Item {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: Math.min(anchors.margins, Math.max(0, anchors.margins - Config.border.thickness))
+        anchors.topMargin: CUtils.clamp(anchors.margins - Config.border.thickness, 0, anchors.margins)
         anchors.margins: Tokens.padding.large
 
         nonAnimWidth: root.nonAnimWidth - anchors.margins * 2
diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml
index 8a5c06a4..d8948deb 100644
--- a/modules/drawers/Panels.qml
+++ b/modules/drawers/Panels.qml
@@ -149,5 +149,6 @@ Item {
         anchors.top: notifications.bottom
         anchors.bottom: utilities.top
         anchors.right: parent.right
+        anchors.topMargin: -notifications.anchors.topMargin
     }
 }
diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml
index 6d50ab76..bb290fce 100644
--- a/modules/sidebar/Wrapper.qml
+++ b/modules/sidebar/Wrapper.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import Caelestia
 import Caelestia.Config
 import qs.components
 
@@ -28,13 +29,14 @@ Item {
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.left: parent.left
-        anchors.margins: Tokens.padding.large
+        anchors.leftMargin: Tokens.padding.large
+        anchors.margins: CUtils.clamp(anchors.leftMargin - Config.border.thickness, 0, anchors.leftMargin)
         anchors.bottomMargin: 0
 
         active: root.shouldBeActive || root.visible
 
         sourceComponent: Content {
-            implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.extraLargeIncreased
+            implicitWidth: Tokens.sizes.sidebar.width - content.anchors.leftMargin - content.anchors.margins
             props: root.props
             visibilities: root.visibilities
         }