diff --git a/components/StyledSwitch.qml b/components/StyledSwitch.qml index c2af7db..70f7646 100644 --- a/components/StyledSwitch.qml +++ b/components/StyledSwitch.qml @@ -21,9 +21,9 @@ Switch { } indicator: Rectangle { - id: indicator + id: indicator - property int padding: 8 + property int padding: 8 implicitWidth: 48 implicitHeight: 24 @@ -51,5 +51,5 @@ Switch { } } - background: null + background: undefined } diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml index dc7c902..deb234a 100644 --- a/modules/bar/components/Power.qml +++ b/modules/bar/components/Power.qml @@ -1,6 +1,7 @@ import qs.components import qs.config import qs.constants +import qs.widgets import QtQuick import QtQuick.Layouts import Quickshell.Services.UPower @@ -8,7 +9,7 @@ import Quickshell.Services.UPower StyledButton { id: root property UPowerDevice laptopBattery: UPower.devices.values.find(device => device.isLaptopBattery) - property bool isCritical: laptopBattery?.percentage < 0.10 + property bool isCritical: laptopBattery.percentage < 0.10 contentItem: RowLayout { spacing: 4 @@ -25,16 +26,16 @@ StyledButton { } font.pixelSize: 16 text: { - if (root.laptopBattery?.state == UPowerDeviceState.Charging) { + if (root.laptopBattery.state == UPowerDeviceState.Charging) { return Icons.batteryCharging; } if (root.isCritical) { return Icons.batteryWarning; } - if (root.laptopBattery?.percentage < 0.33) { + if (root.laptopBattery.percentage < 0.33) { return Icons.batteryLow; } - if (root.laptopBattery?.percentage < 0.66) { + if (root.laptopBattery.percentage < 0.66) { return Icons.batteryMedium; } return Icons.batteryFull; @@ -52,7 +53,7 @@ StyledButton { } return Theme.palette.basecontent; } - text: `${(root.laptopBattery?.percentage.toFixed(2) * 100)}%` + text: `${(root.laptopBattery.percentage.toFixed(2) * 100)}%` } } visible: laptopBattery