From c47830f40420b649ef6b5e93c2836632b7dcd315 Mon Sep 17 00:00:00 2001
From: ItsLemmy <studio@quadbyte.net>
Date: Tue, 4 Nov 2025 23:09:15 -0500
Subject: [PATCH] multi-bar: better settings ui (more compact)

---
 Modules/Settings/Tabs/BarTab.qml | 115 ++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 48 deletions(-)

diff --git a/Modules/Settings/Tabs/BarTab.qml b/Modules/Settings/Tabs/BarTab.qml
index 7a8d8e40..5f957b7c 100644
--- a/Modules/Settings/Tabs/BarTab.qml
+++ b/Modules/Settings/Tabs/BarTab.qml
@@ -73,6 +73,50 @@ ColumnLayout {
                }
   }
 
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginM
+    Layout.bottomMargin: Style.marginM
+    visible: Settings.data.bar.syncAcrossMonitors
+  }
+
+  // Monitor Visibility Configuration (only shown in sync mode)
+  ColumnLayout {
+    spacing: Style.marginM
+    Layout.fillWidth: true
+    visible: Settings.data.bar.syncAcrossMonitors
+
+    NHeader {
+      label: I18n.tr("settings.bar.monitors.section.label")
+      description: I18n.tr("settings.bar.monitors.section.description")
+    }
+
+    Repeater {
+      model: Quickshell.screens || []
+      delegate: NCheckbox {
+        Layout.fillWidth: true
+        label: modelData.name || "Unknown"
+        description: {
+          const compositorScale = CompositorService.getDisplayScale(modelData.name)
+          I18n.tr("system.monitor-description", {
+                    "model": modelData.model,
+                    "width": modelData.width * compositorScale,
+                    "height": modelData.height * compositorScale,
+                    "scale": compositorScale
+                  })
+        }
+        checked: (Settings.data.bar.monitors || []).length === 0 || (Settings.data.bar.monitors || []).indexOf(modelData.name) !== -1
+        onToggled: checked => {
+                     if (checked) {
+                       Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, modelData.name)
+                     } else {
+                       Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, modelData.name)
+                     }
+                   }
+      }
+    }
+  }
+
   NDivider {
     Layout.fillWidth: true
     Layout.topMargin: Style.marginM
@@ -102,6 +146,29 @@ ColumnLayout {
     description: Settings.data.bar.syncAcrossMonitors ? I18n.tr("settings.bar.appearance.section.description") : `Configure bar settings for monitor ${currentMonitorName}`
   }
 
+  // Monitor visibility toggle (only shown in per-monitor mode)
+  NToggle {
+    Layout.fillWidth: true
+    visible: !Settings.data.bar.syncAcrossMonitors
+    label: `Show bar on ${currentMonitorName}`
+    description: `Enable or disable the bar on this monitor`
+    checked: (Settings.data.bar.monitors || []).length === 0 || (Settings.data.bar.monitors || []).indexOf(currentMonitorName) !== -1
+    onToggled: checked => {
+                 if (checked) {
+                   Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, currentMonitorName)
+                 } else {
+                   Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, currentMonitorName)
+                 }
+               }
+  }
+
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginM
+    Layout.bottomMargin: Style.marginM
+    visible: !Settings.data.bar.syncAcrossMonitors
+  }
+
   // Position
   NComboBox {
     Layout.fillWidth: true
@@ -335,54 +402,6 @@ ColumnLayout {
     }
   }
 
-  NDivider {
-    Layout.fillWidth: true
-    Layout.topMargin: Style.marginXL
-    Layout.bottomMargin: Style.marginXL
-  }
-
-  // Monitor Visibility Configuration
-  ColumnLayout {
-    spacing: Style.marginM
-    Layout.fillWidth: true
-
-    NHeader {
-      label: I18n.tr("settings.bar.monitors.section.label")
-      description: I18n.tr("settings.bar.monitors.section.description")
-    }
-
-    Repeater {
-      model: Quickshell.screens || []
-      delegate: NCheckbox {
-        Layout.fillWidth: true
-        label: modelData.name || "Unknown"
-        description: {
-          const compositorScale = CompositorService.getDisplayScale(modelData.name)
-          I18n.tr("system.monitor-description", {
-                    "model": modelData.model,
-                    "width": modelData.width * compositorScale,
-                    "height": modelData.height * compositorScale,
-                    "scale": compositorScale
-                  })
-        }
-        checked: (Settings.data.bar.monitors || []).indexOf(modelData.name) !== -1
-        onToggled: checked => {
-                     if (checked) {
-                       Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, modelData.name)
-                     } else {
-                       Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, modelData.name)
-                     }
-                   }
-      }
-    }
-  }
-
-  NDivider {
-    Layout.fillWidth: true
-    Layout.topMargin: Style.marginXL
-    Layout.bottomMargin: Style.marginXL
-  }
-
   // Widget management functions - now monitor-aware
   function _addWidgetToSection(widgetId, section) {
     var config = JSON.parse(JSON.stringify(currentConfig))