Bluetooth: NBox wrapping

2026-08-15 18:43:59 +00:00 · 2025-10-31 14:58:41 -04:00
parent 56203e1a07
commit 13f82d10e2
2 changed files with 225 additions and 203 deletions
@@ -11,7 +11,7 @@ import qs.Widgets
 NPanel {
  id: root

-  preferredWidth: 380 * Style.uiScaleRatio
+  preferredWidth: 420 * Style.uiScaleRatio
  preferredHeight: 500 * Style.uiScaleRatio
  panelKeyboardFocus: true

@@ -23,63 +23,67 @@ NPanel {
      anchors.margins: Style.marginL
      spacing: Style.marginM

-      // HEADER
-      RowLayout {
+      // Header
+      NBox {
        Layout.fillWidth: true
-        spacing: Style.marginM
+        implicitHeight: headerRow.implicitHeight + (Style.marginM * 2)

-        NIcon {
-          icon: "bluetooth"
-          pointSize: Style.fontSizeXXL
-          color: Color.mPrimary
-        }
+        RowLayout {
+          id: headerRow
+          anchors.fill: parent
+          anchors.leftMargin: Style.marginM
+          anchors.rightMargin: Style.marginM
+          spacing: Style.marginM

-        NText {
-          text: I18n.tr("bluetooth.panel.title")
-          pointSize: Style.fontSizeL
-          font.weight: Style.fontWeightBold
-          color: Color.mOnSurface
-          Layout.fillWidth: true
-        }
+          NIcon {
+            icon: "bluetooth"
+            pointSize: Style.fontSizeXXL
+            color: Color.mPrimary
+          }

-        NToggle {
-          id: bluetoothSwitch
-          checked: BluetoothService.enabled
-          onToggled: checked => BluetoothService.setBluetoothEnabled(checked)
-          baseSize: Style.baseWidgetSize * 0.65
-        }
+          NText {
+            text: I18n.tr("bluetooth.panel.title")
+            pointSize: Style.fontSizeL
+            font.weight: Style.fontWeightBold
+            color: Color.mOnSurface
+            Layout.fillWidth: true
+          }

-        NIconButton {
-          enabled: BluetoothService.enabled
-          icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "refresh"
-          tooltipText: I18n.tr("tooltips.refresh-devices")
-          baseSize: Style.baseWidgetSize * 0.8
-          onClicked: {
-            if (BluetoothService.adapter) {
-              BluetoothService.adapter.discovering = !BluetoothService.adapter.discovering
+          NToggle {
+            id: bluetoothSwitch
+            checked: BluetoothService.enabled
+            onToggled: checked => BluetoothService.setBluetoothEnabled(checked)
+            baseSize: Style.baseWidgetSize * 0.65
+          }
+
+          NIconButton {
+            enabled: BluetoothService.enabled
+            icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "refresh"
+            tooltipText: I18n.tr("tooltips.refresh-devices")
+            baseSize: Style.baseWidgetSize * 0.8
+            onClicked: {
+              if (BluetoothService.adapter) {
+                BluetoothService.adapter.discovering = !BluetoothService.adapter.discovering
+              }
+            }
+          }
+
+          NIconButton {
+            icon: "close"
+            tooltipText: I18n.tr("tooltips.close")
+            baseSize: Style.baseWidgetSize * 0.8
+            onClicked: {
+              root.close()
            }
          }
        }
-
-        NIconButton {
-          icon: "close"
-          tooltipText: I18n.tr("tooltips.close")
-          baseSize: Style.baseWidgetSize * 0.8
-          onClicked: {
-            root.close()
-          }
-        }
      }

-      NDivider {
-        Layout.fillWidth: true
-      }
-
-      Rectangle {
+      // Adapter not available of disabled
+      NBox {
        visible: !(BluetoothService.adapter && BluetoothService.adapter.enabled)
        Layout.fillWidth: true
        Layout.fillHeight: true
-        color: Color.transparent

        // Center the content within this rectangle
        ColumnLayout {
@@ -166,51 +170,60 @@ NPanel {
          }

          // Fallback - No devices, scanning
-          ColumnLayout {
-            Layout.alignment: Qt.AlignHCenter
-            spacing: Style.marginM
-            visible: {
-              if (!BluetoothService.adapter || !BluetoothService.adapter.discovering || !Bluetooth.devices) {
-                return false
+          NBox {
+            Layout.fillWidth: true
+            Layout.preferredHeight: columnScanning.implicitHeight + Style.marginM * 2
+              visible: {
+                if (!BluetoothService.adapter || !BluetoothService.adapter.discovering || !Bluetooth.devices) {
+                  return false
+                }
+
+                var availableCount = Bluetooth.devices.values.filter(dev => {
+                                                                       return dev && !dev.paired && !dev.pairing && !dev.blocked && (dev.signalStrength === undefined || dev.signalStrength > 0)
+                                                                     }).length
+                return (availableCount === 0)
              }

-              var availableCount = Bluetooth.devices.values.filter(dev => {
-                                                                     return dev && !dev.paired && !dev.pairing && !dev.blocked && (dev.signalStrength === undefined || dev.signalStrength > 0)
-                                                                   }).length
-              return (availableCount === 0)
-            }

-            RowLayout {
-              Layout.alignment: Qt.AlignHCenter
-              spacing: Style.marginXS
+            ColumnLayout {
+              id: columnScanning
+              anchors.fill: parent
+              anchors.margins: Style.marginM

-              NIcon {
-                icon: "refresh"
-                pointSize: Style.fontSizeXXL * 1.5
-                color: Color.mPrimary
+              spacing: Style.marginM

-                RotationAnimation on rotation {
-                  running: true
-                  loops: Animation.Infinite
-                  from: 0
-                  to: 360
-                  duration: Style.animationSlow * 4
+              RowLayout {
+                Layout.alignment: Qt.AlignHCenter
+                spacing: Style.marginXS
+
+                NIcon {
+                  icon: "refresh"
+                  pointSize: Style.fontSizeXXL * 1.5
+                  color: Color.mPrimary
+
+                  RotationAnimation on rotation {
+                    running: true
+                    loops: Animation.Infinite
+                    from: 0
+                    to: 360
+                    duration: Style.animationSlow * 4
+                  }
+                }
+
+                NText {
+                  text: I18n.tr("bluetooth.panel.scanning")
+                  pointSize: Style.fontSizeL
+                  color: Color.mOnSurface
                }
              }

              NText {
-                text: I18n.tr("bluetooth.panel.scanning")
-                pointSize: Style.fontSizeL
-                color: Color.mOnSurface
+                text: I18n.tr("bluetooth.panel.pairing-mode")
+                pointSize: Style.fontSizeM
+                color: Color.mOnSurfaceVariant
+                Layout.alignment: Qt.AlignHCenter
              }
            }
-
-            NText {
-              text: I18n.tr("bluetooth.panel.pairing-mode")
-              pointSize: Style.fontSizeM
-              color: Color.mOnSurfaceVariant
-              Layout.alignment: Qt.AlignHCenter
-            }
          }

          Item {