diff --git a/modules/Backlight.qml b/modules/Backlight.qml index 91b4897..cd1749e 100644 --- a/modules/Backlight.qml +++ b/modules/Backlight.qml @@ -66,7 +66,6 @@ M.BarSection { } M.BarLabel { label: root.percent + "%" - minText: "100%" color: M.Theme.base0A anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/BarGroup.qml b/modules/BarGroup.qml index 5237165..878e38d 100644 --- a/modules/BarGroup.qml +++ b/modules/BarGroup.qml @@ -31,7 +31,7 @@ Item { anchors.fill: shadowSource shadowEnabled: true shadowColor: root.borderColor - shadowBlur: 1.0 + shadowBlur: 0.6 shadowVerticalOffset: 0 shadowHorizontalOffset: 0 } diff --git a/modules/BarLabel.qml b/modules/BarLabel.qml index 5fe262b..f5cff64 100644 --- a/modules/BarLabel.qml +++ b/modules/BarLabel.qml @@ -6,17 +6,8 @@ Text { id: root property string label: "" property string tooltip: "" - property string minText: "" text: label - width: minText ? Math.max(implicitWidth, _minMetrics.width) : implicitWidth - - TextMetrics { - id: _minMetrics - text: root.minText - font.pixelSize: root.font.pixelSize - font.family: root.font.family - } color: M.Theme.base05 font.pixelSize: M.Theme.fontSize font.family: M.Theme.fontFamily diff --git a/modules/Battery.qml b/modules/Battery.qml index bcde3ff..6e0970e 100644 --- a/modules/Battery.qml +++ b/modules/Battery.qml @@ -63,7 +63,6 @@ M.BarSection { } M.BarLabel { label: Math.round(root.pct) + "%" - minText: "100%" color: root._stateColor opacity: root._blinkOpacity anchors.verticalCenter: parent.verticalCenter diff --git a/modules/Bluetooth.qml b/modules/Bluetooth.qml index a257292..8a9833b 100644 --- a/modules/Bluetooth.qml +++ b/modules/Bluetooth.qml @@ -10,31 +10,24 @@ M.BarSection { if (root.state === "off") return "Bluetooth: off"; if (root.state === "connected") - return "Bluetooth: " + root.device + (root.batteryPct >= 0 ? "\nBattery: " + root.batteryPct + "%" : ""); + return "Bluetooth: " + root.device; return "Bluetooth: on"; } property string state: "unavailable" property string device: "" - property int batteryPct: -1 function _parse(text) { - const lines = text.trim().split("\n"); - const t = lines[0] || ""; + const t = text.trim(); const sep = t.indexOf(":"); root.state = sep === -1 ? t : t.slice(0, sep); root.device = sep === -1 ? "" : t.slice(sep + 1); - root.batteryPct = -1; - for (let i = 1; i < lines.length; i++) { - if (lines[i].startsWith("bat:")) - root.batteryPct = parseInt(lines[i].slice(4)) || -1; - } } Process { id: proc running: true - command: ["sh", "-c", "s=$(bluetoothctl show 2>/dev/null); " + "[ -z \"$s\" ] && echo unavailable && exit; " + "echo \"$s\" | grep -q 'Powered: yes' || { echo off:; exit; }; " + "info=$(bluetoothctl info 2>/dev/null); " + "d=$(echo \"$info\" | awk -F': ' '/\\tName:/{n=$2}/Connected: yes/{c=1}END{if(c)print n}'); " + "[ -n \"$d\" ] && echo \"connected:$d\" || { echo on:; exit; }; " + "bat=$(echo \"$info\" | awk -F': ' '/Battery Percentage.*\\(/{gsub(/[^0-9]/,\"\",$2);print $2}'); " + "[ -n \"$bat\" ] && echo \"bat:$bat\""] + command: ["sh", "-c", "s=$(bluetoothctl show 2>/dev/null); " + "[ -z \"$s\" ] && echo unavailable && exit; " + "echo \"$s\" | grep -q 'Powered: yes' || { echo off:; exit; }; " + "d=$(bluetoothctl info 2>/dev/null | awk -F': ' '/\\tName:/{n=$2}/Connected: yes/{c=1}END{if(c)print n}'); " + "[ -n \"$d\" ] && echo \"connected:$d\" || echo on:"] stdout: StdioCollector { onStreamFinished: root._parse(text) } @@ -61,7 +54,7 @@ M.BarSection { } M.BarLabel { visible: root.state === "connected" - label: root.device + (root.batteryPct >= 0 ? " " + root.batteryPct + "%" : "") + label: root.device anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/Cpu.qml b/modules/Cpu.qml index 764e193..01ea93d 100644 --- a/modules/Cpu.qml +++ b/modules/Cpu.qml @@ -59,7 +59,6 @@ M.BarSection { } M.BarLabel { label: root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2) - minText: "99%@9.99" color: M.Theme.base08 anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/Disk.qml b/modules/Disk.qml index 90700b6..37d682f 100644 --- a/modules/Disk.qml +++ b/modules/Disk.qml @@ -39,7 +39,6 @@ M.BarSection { } M.BarLabel { label: root.freePct + "% " + root.totalTb.toFixed(1) - minText: "100% 9.9" color: M.Theme.base08 anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/Memory.qml b/modules/Memory.qml index 6461c7c..284629e 100644 --- a/modules/Memory.qml +++ b/modules/Memory.qml @@ -39,7 +39,6 @@ M.BarSection { } M.BarLabel { label: root.percent + "%" - minText: "100%" color: M.Theme.base08 anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/Temperature.qml b/modules/Temperature.qml index 8177b8d..0c94b3c 100644 --- a/modules/Temperature.qml +++ b/modules/Temperature.qml @@ -30,7 +30,6 @@ M.BarSection { } M.BarLabel { label: root.celsius + "\u00B0C" - minText: "100\u00B0C" color: root._stateColor anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/Volume.qml b/modules/Volume.qml index f3eb1ac..86c44d4 100644 --- a/modules/Volume.qml +++ b/modules/Volume.qml @@ -25,7 +25,6 @@ M.BarSection { } M.BarLabel { label: Math.round(root.volume * 100) + "%" - minText: "100%" color: root.muted ? M.Theme.base04 : M.Theme.base0E anchors.verticalCenter: parent.verticalCenter }