Merge branch 'bar-service'

Modules/Bar/Bar.qml

@@ -8,6 +8,7 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 import qs.Modules.Notification
+import qs.Modules.Bar.Extras
 
 Variants {
   model: Quickshell.screens
@@ -88,7 +89,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.left
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,
@@ -111,7 +112,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.center
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,
@@ -135,7 +136,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.right
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,
@@ -169,7 +170,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.left
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,
@@ -194,7 +195,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.center
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,
@@ -220,7 +221,7 @@ Variants {
 
               Repeater {
                 model: Settings.data.bar.widgets.right
-                delegate: NWidgetLoader {
+                delegate: BarWidgetLoader {
                   widgetId: (modelData.id !== undefined ? modelData.id : "")
                   widgetProps: {
                     "screen": root.modelData || null,

Modules/Bar/Extras/BarWidgetLoader.qml

@@ -0,0 +1,76 @@
+import QtQuick
+import Quickshell
+import qs.Services
+import qs.Commons
+
+Item {
+  id: root
+
+  property string widgetId: ""
+  property var widgetProps: ({})
+  property string screenName: widgetProps.screen ? widgetProps.screen.name : ""
+  property string section: widgetProps.section || ""
+  property int sectionIndex: widgetProps.sectionWidgetIndex || 0
+
+  Connections {
+    target: ScalingService
+    function onScaleChanged(aScreenName, scale) {
+      if (loader.item && loader.item.screen && aScreenName === screenName) {
+        loader.item['scaling'] = scale
+      }
+    }
+  }
+
+  // Don't reserve space unless the loaded widget is really visible
+  implicitWidth: loader.item ? loader.item.visible ? loader.item.implicitWidth : 0 : 0
+  implicitHeight: loader.item ? loader.item.visible ? loader.item.implicitHeight : 0 : 0
+
+  Loader {
+    id: loader
+
+    anchors.fill: parent
+    active: Settings.isLoaded && widgetId !== ""
+    sourceComponent: {
+      if (!active) {
+        return null
+      }
+      return BarWidgetRegistry.getWidget(widgetId)
+    }
+
+    onLoaded: {
+      if (item && widgetProps) {
+        // Apply properties to loaded widget
+        for (var prop in widgetProps) {
+          if (item.hasOwnProperty(prop)) {
+            item[prop] = widgetProps[prop]
+          }
+        }
+      }
+
+      // Register this widget instance with BarService
+      if (screenName && section) {
+        BarService.registerWidget(screenName, section, widgetId, sectionIndex, item)
+      }
+
+      if (item.hasOwnProperty("onLoaded")) {
+        item.onLoaded()
+      }
+
+      //Logger.log("BarWidgetLoader", "Loaded", widgetId, "on screen", item.screen.name)
+    }
+
+    Component.onDestruction: {
+      // Unregister when destroyed
+      if (screenName && section) {
+        BarService.unregisterWidget(screenName, section, widgetId, sectionIndex)
+      }
+    }
+  }
+
+  // Error handling
+  onWidgetIdChanged: {
+    if (widgetId && !BarWidgetRegistry.hasWidget(widgetId)) {
+      Logger.warn("BarWidgetLoader", "Widget not found in bar registry:", widgetId)
+    }
+  }
+}

Modules/Bar/Widgets/Battery.qml

@@ -86,7 +86,7 @@ Item {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: testMode ? BatteryService.getIcon(testPercent, testCharging, true) : BatteryService.getIcon(percent, charging, isReady)
     text: (isReady || testMode) ? Math.round(percent) : "-"
     suffix: "%"

Modules/Bar/Widgets/Brightness.qml

@@ -78,7 +78,7 @@ Item {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: getIcon()
     autoHide: false // Important to be false so we can hover as long as we want
     text: {

Modules/Bar/Widgets/CustomButton.qml

@@ -47,7 +47,7 @@ Item {
   BarPill {
     id: pill
 
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: customIcon
     text: _dynamicText
     compact: (Settings.data.bar.density === "compact")

Modules/Bar/Widgets/KeyboardLayout.qml

@@ -44,7 +44,7 @@ Item {
 
     anchors.verticalCenter: parent.verticalCenter
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: "keyboard"
     autoHide: false // Important to be false so we can hover as long as we want
     text: currentLayout.toUpperCase()

Modules/Bar/Widgets/Microphone.qml

@@ -89,7 +89,7 @@ Item {
 
   BarPill {
     id: pill
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: getIcon()
     compact: (Settings.data.bar.density === "compact")
     autoHide: false // Important to be false so we can hover as long as we want

Modules/Bar/Widgets/Volume.qml

@@ -76,7 +76,7 @@ Item {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getPillDirection(root)
+    rightOpen: BarService.getPillDirection(root)
     icon: getIcon()
     autoHide: false // Important to be false so we can hover as long as we want
     text: Math.floor(AudioService.volume * 100)

Modules/IPC/IPCManager.qml

@@ -27,7 +27,8 @@ Item {
   IpcHandler {
     target: "notifications"
     function toggleHistory() {
-      notificationHistoryPanel.toggle()
+      // Will attempt to open the panel next to the bar button if any.
+      notificationHistoryPanel.toggle(BarService.lookupWidget("NotificationHistory"))
     }
     function toggleDND() {
       Settings.data.notifications.doNotDisturb = !Settings.data.notifications.doNotDisturb
@@ -118,7 +119,8 @@ Item {
   IpcHandler {
     target: "sidePanel"
     function toggle() {
-      sidePanel.toggle()
+      // Will attempt to open the panel next to the bar button if any.
+      sidePanel.toggle(BarService.lookupWidget("SidePanelToggle"))
     }
   }