Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell

Modules/Bar/Bar.qml

@@ -47,7 +47,16 @@ Item {
   Loader {
     id: barContentLoader
     anchors.fill: parent
-    active: root.screen !== null && root.screen !== undefined
+    active: {
+      if (root.screen === null || root.screen === undefined) {
+        return false
+      }
+
+      var monitors = Settings.data.bar.monitors || []
+      var result = monitors.length === 0 || monitors.includes(root.screen.name)
+
+      return result
+    }
 
     sourceComponent: Item {
       anchors.fill: parent
@@ -61,20 +70,20 @@ Item {
         x: {
           var baseX = (root.barPosition === "right") ? (parent.width - Style.barHeight - root.barMarginH) : root.barMarginH
           if (root.barPosition === "right")
-            return baseX + root.attachmentOverlap
+            return baseX - root.attachmentOverlap // Extend left towards panels
           return baseX
         }
         y: {
           var baseY = (root.barPosition === "bottom") ? (parent.height - Style.barHeight - root.barMarginV) : root.barMarginV
           if (root.barPosition === "bottom")
-            return baseY + root.attachmentOverlap
+            return baseY - root.attachmentOverlap // Extend up towards panels
           return baseY
         }
         width: {
           var baseWidth = root.barIsVertical ? Style.barHeight : (parent.width - root.barMarginH * 2)
           if (!root.barIsVertical)
             return baseWidth // Horizontal bars extend via height, not width
-          return baseWidth + root.attachmentOverlap
+          return baseWidth + root.attachmentOverlap + 1
         }
         height: {
           var baseHeight = root.barIsVertical ? (parent.height - root.barMarginV * 2) : Style.barHeight

Modules/Bar/Battery/BatteryPanel.qml

@@ -10,9 +10,6 @@ import qs.Widgets
 NPanel {
   id: root
 
-  preferredWidth: 350 * Style.uiScaleRatio
-  preferredHeight: 210 * Style.uiScaleRatio
-
   property var optionsModel: []
 
   function updateOptionsModel() {
@@ -33,11 +30,52 @@ NPanel {
     updateOptionsModel()
   }
 
+  ButtonGroup {
+    id: batteryGroup
+  }
+
+  Component {
+    id: optionsComponent
+    ColumnLayout {
+      spacing: Style.marginM
+      Repeater {
+        model: root.optionsModel
+        delegate: NRadioButton {
+          ButtonGroup.group: batteryGroup
+          required property var modelData
+          text: I18n.tr(modelData.label, {
+                          "percent": BatteryService.getThresholdValue(modelData.id)
+                        })
+          checked: BatteryService.chargingMode === modelData.id
+          onClicked: {
+            BatteryService.setChargingMode(modelData.id)
+          }
+          Layout.fillWidth: true
+        }
+      }
+    }
+  }
+
+  Component {
+    id: disabledComponent
+    NText {
+      text: I18n.tr("battery.panel.disabled")
+      pointSize: Style.fontSizeL
+      color: Color.mOnSurfaceVariant
+      wrapMode: Text.WordWrap
+      horizontalAlignment: Text.AlignHCenter
+    }
+  }
+
   panelContent: Item {
     anchors.fill: parent
+    property real contentPreferredHeight: mainLayout.implicitHeight + Style.marginM * 2
+    property real contentPreferredWidth: 350 * Style.uiScaleRatio
 
     ColumnLayout {
-      anchors.fill: parent
+      id: mainLayout
+      anchors.centerIn: parent
+      width: parent.contentPreferredWidth - Style.marginM * 2
       anchors.margins: Style.marginM
       spacing: Style.marginM
 
@@ -78,57 +116,15 @@ NPanel {
         }
       }
 
-      ButtonGroup {
-        id: batteryGroup
-      }
-
       NBox {
         Layout.fillWidth: true
-        Layout.fillHeight: true
+        Layout.preferredHeight: loader.implicitHeight + Style.marginM * 2
 
-        ColumnLayout {
-          anchors.fill: parent
-          anchors.margins: Style.marginM
-          spacing: Style.marginM
-
-          Repeater {
-            model: optionsModel
-
-            NRadioButton {
-              visible: BatteryService.chargingMode !== BatteryService.ChargingMode.Disabled
-              ButtonGroup.group: batteryGroup
-              required property var modelData
-              text: I18n.tr(modelData.label, {
-                              "percent": BatteryService.getThresholdValue(modelData.id)
-                            })
-              checked: BatteryService.chargingMode === modelData.id
-              onClicked: {
-                BatteryService.setChargingMode(modelData.id)
-              }
-              Layout.fillWidth: true
-            }
-          }
-        }
-
-        ColumnLayout {
-          visible: BatteryService.chargingMode === BatteryService.ChargingMode.Disabled
-          anchors.fill: parent
-          spacing: Style.marginM
-
-          Item {
-            Layout.fillHeight: true
-          }
-
-          NText {
-            text: I18n.tr("battery.panel.disabled")
-            pointSize: Style.fontSizeL
-            color: Color.mOnSurfaceVariant
-            Layout.alignment: Qt.AlignHCenter
-          }
-
-          Item {
-            Layout.fillHeight: true
-          }
+        Loader {
+          id: loader
+          anchors.centerIn: parent
+          width: parent.width - Style.marginM * 2
+          sourceComponent: BatteryService.chargingMode === BatteryService.ChargingMode.Disabled ? disabledComponent : optionsComponent
         }
       }
     }

Modules/Bar/Calendar/CalendarPanel.qml

@@ -611,8 +611,10 @@ NPanel {
 
                       onClicked: {
                         const dateWithSlashes = `${(modelData.month + 1).toString().padStart(2, '0')}/${modelData.day.toString().padStart(2, '0')}/${modelData.year.toString().substring(2)}`
-                        Quickshell.execDetached(["gnome-calendar", "--date", dateWithSlashes])
-                        root.close()
+                        if (ProgramCheckerService.gnomeCalendarAvailable) {
+                          Quickshell.execDetached(["gnome-calendar", "--date", dateWithSlashes])
+                          root.close()
+                        }
                       }
 
                       onExited: {

Modules/ControlCenter/ControlCenterPanel.qml

@@ -49,12 +49,22 @@ NPanel {
 
   // Positioning
   readonly property string controlCenterPosition: Settings.data.controlCenter.position
-  panelAnchorHorizontalCenter: controlCenterPosition !== "close_to_bar_button" && (controlCenterPosition.endsWith("_center") || controlCenterPosition === "center")
-  panelAnchorVerticalCenter: controlCenterPosition === "center"
-  panelAnchorLeft: controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.endsWith("_left")
-  panelAnchorRight: controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.endsWith("_right")
-  panelAnchorBottom: controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.startsWith("bottom_")
-  panelAnchorTop: controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.startsWith("top_")
+
+  // Check if there's a bar on this screen
+  readonly property bool hasBarOnScreen: {
+    var monitors = Settings.data.bar.monitors || []
+    return monitors.length === 0 || monitors.includes(screen?.name)
+  }
+
+  // When position is "close_to_bar_button" but there's no bar, fall back to center
+  readonly property bool shouldCenter: controlCenterPosition === "close_to_bar_button" && !hasBarOnScreen
+
+  panelAnchorHorizontalCenter: shouldCenter || (controlCenterPosition !== "close_to_bar_button" && (controlCenterPosition.endsWith("_center") || controlCenterPosition === "center"))
+  panelAnchorVerticalCenter: shouldCenter || controlCenterPosition === "center"
+  panelAnchorLeft: !shouldCenter && controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.endsWith("_left")
+  panelAnchorRight: !shouldCenter && controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.endsWith("_right")
+  panelAnchorBottom: !shouldCenter && controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.startsWith("bottom_")
+  panelAnchorTop: !shouldCenter && controlCenterPosition !== "close_to_bar_button" && controlCenterPosition.startsWith("top_")
 
   readonly property int profileHeight: Math.round(64 * Style.uiScaleRatio)
   readonly property int shortcutsHeight: Math.round(52 * Style.uiScaleRatio)