diff --git a/modules/bar/widgets/Battery.qml b/modules/bar/widgets/Battery.qml index 09c18d5..24fc713 100644 --- a/modules/bar/widgets/Battery.qml +++ b/modules/bar/widgets/Battery.qml @@ -7,7 +7,7 @@ import "../states/Battery" MouseArea { id: batteryButton - width: clicked ? Math.max(batteryPercentageText.width + parent.spacing*2, bar.height) : Math.max(batteryText.width + parent.spacing*2, bar.height) + width: clicked ? Math.max(batteryPercentage.width + parent.spacing*2, bar.height) : Math.max(batteryText.width + parent.spacing*2, bar.height) height: bar.height hoverEnabled: true cursorShape: Qt.PointingHandCursor @@ -68,37 +68,55 @@ MouseArea { ) } - Text { - id: batteryPercentageText - visible : clicked + Row { + id: batteryPercentage + visible: clicked anchors.centerIn: parent - text: ( - BatteryState.charging ? "󰂄 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 90 ? "󰁹 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 80 ? "󰂂 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 70 ? "󰂁 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 60 ? "󰂀 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 50 ? "󰁿 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 40 ? "󰁾 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 30 ? "󰁽 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 20 ? "󰁼 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 10 ? "󰁻 " + BatteryState.percentage + "%" : - BatteryState.percentage >= 5 ? "󰁺 " + BatteryState.percentage + "%" : - "󰂃 " + BatteryState.percentage + "%" - ) - font.pixelSize: BatteryState.charging ? "󰂄" : batteryText.font.pixelSize*0.75 - font.family: "Nerd Font" - color: ( - BatteryState.percentage <= 5 ? "red" : - BatteryState.charging ? "green" : - BatteryState.percentage < 10 ? "yellow" : - batteryButton.containsMouse ? Colors.tertiary_fg : - Colors.primary - ) + spacing: batteryButton.parent.spacing/2 + + Text { + id: batteryPercentageSymbol + text: ( + BatteryState.charging ? "󰂄" : + BatteryState.percentage >= 90 ? "󰁹": + BatteryState.percentage >= 80 ? "󰂂": + BatteryState.percentage >= 70 ? "󰂁": + BatteryState.percentage >= 60 ? "󰂀": + BatteryState.percentage >= 50 ? "󰁿": + BatteryState.percentage >= 40 ? "󰁾": + BatteryState.percentage >= 30 ? "󰁽": + BatteryState.percentage >= 20 ? "󰁼": + BatteryState.percentage >= 10 ? "󰁻": + BatteryState.percentage >= 5 ? "󰁺": + "󰂃" + ) + + font.pixelSize: batteryText.font.pixelSize * 0.75 + font.family: "CodeNewRoman Nerd Font" + font.bold: true + + color: ( + BatteryState.percentage <= 5 ? "red" : + BatteryState.charging ? "green" : + BatteryState.percentage < 10 ? "yellow" : + batteryButton.containsMouse ? Colors.tertiary_fg : + Colors.primary + ) + } + + Text { + id: batteryPercentageText + text: BatteryState.percentage + "%" + + font.pixelSize: batteryText.font.pixelSize * 0.75 + font.family: "CodeNewRoman Nerd Font" + font.bold: true + + color: batteryPercentageSymbol.color + } } } - Process { id: batteryAvailibleScript command: ["sh", "-c", "upower -e | grep -q '^/org/freedesktop/UPower/devices/battery' && echo '1' || echo '0'"]