From 658b583e8483445edc75ff47b17e30d1c641a6ff Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Fri, 19 Sep 2025 11:05:15 -0400
Subject: [PATCH] Floating bar: On the perpendicular axis of the bar: only
 apply the floating margin between the screen and the bar. This will avoid
 people having to deal with struts and gaps.

- ex: if bar is on top, the vertical margin will only be applied between
the top screen edge and the bar, not extra margin below the bar
---
 Modules/Bar/Bar.qml | 9 +++++----
 Widgets/NPanel.qml  | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Modules/Bar/Bar.qml b/Modules/Bar/Bar.qml
index 04429d90..a5d51f09 100644
--- a/Modules/Bar/Bar.qml
+++ b/Modules/Bar/Bar.qml
@@ -47,11 +47,12 @@ Variants {
       }
 
       // Floating bar margins - only apply when floating is enabled
+      // Also don't apply margin on the opposite side ot the bar orientation, ex: if bar is floating on top, margin is only applied on top, not bottom.
       margins {
-        top: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
-        bottom: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
-        left: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
-        right: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
+        top: Settings.data.bar.floating && Settings.data.bar.position !== "bottom" ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
+        bottom: Settings.data.bar.floating && Settings.data.bar.position !== "top"  ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
+        left: Settings.data.bar.floating && Settings.data.bar.position !== "right" ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
+        right: Settings.data.bar.floating && Settings.data.bar.position !== "left" ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
       }
 
       Item {
diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml
index 158e86b4..26ad0b8b 100644
--- a/Widgets/NPanel.qml
+++ b/Widgets/NPanel.qml
@@ -257,7 +257,7 @@ Loader {
           }
           switch (barPosition || panelAnchorVerticalCenter) {
           case "top":
-            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * 2 * Style.marginXL * scaling : 0)
+            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
           default:
             return Style.marginS * scaling
           }
@@ -269,7 +269,7 @@ Loader {
           }
           switch (barPosition) {
           case "bottom":
-            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * 2 * Style.marginXL * scaling : 0)
+            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
           default:
             return Style.marginS * scaling
           }
@@ -281,7 +281,7 @@ Loader {
           }
           switch (barPosition) {
           case "left":
-            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * 2 * Style.marginXL * scaling : 0)
+            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0)
           default:
             return Style.marginS * scaling
           }
@@ -293,7 +293,7 @@ Loader {
           }
           switch (barPosition) {
           case "right":
-            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * 2 * Style.marginXL * scaling : 0)
+            return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0)
           default:
             return Style.marginS * scaling
           }