lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant function: hasAnyBattery()

Browse Source
This commit is contained in:
Turann_
2026-01-31 23:27:37 +03:00
parent 3cca35f3aa
commit 51d4bde15a
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/LockScreen/LockScreen.qml
+1 -1
View File
@@ -82,7 +82,7 @@ Loader {
property real percent: BatteryService.batteryPercentage
property bool charging: BatteryService.batteryCharging
property bool pluggedIn: BatteryService.batteryPluggedIn
property bool batteryVisible: isReady && BatteryService.hasAnyBattery()
property bool batteryVisible: isReady
}
Item {
Modules/LockScreen/LockScreenPanel.qml
+7 -7
View File
@@ -109,7 +109,7 @@ Item {
// Compact status indicators container (compact mode only)
Rectangle {
width: {
var hasBattery = batteryIndicator.isReady && BatteryService.hasAnyBattery();
var hasBattery = batteryIndicator.isReady;
var hasKeyboard = keyboardLayout.currentLayout !== "Unknown";
if (hasBattery && hasKeyboard) {
@@ -127,7 +127,7 @@ Item {
topLeftRadius: Style.radiusL
topRightRadius: Style.radiusL
color: Color.mSurface
visible: Settings.data.general.compactLockScreen && ((batteryIndicator.isReady && BatteryService.hasAnyBattery()) || keyboardLayout.currentLayout !== "Unknown")
visible: Settings.data.general.compactLockScreen && ((batteryIndicator.isReady) || keyboardLayout.currentLayout !== "Unknown")
RowLayout {
anchors.centerIn: parent
@@ -136,7 +136,7 @@ Item {
// Battery indicator
RowLayout {
spacing: Style.marginS
visible: batteryIndicator.isReady && BatteryService.hasAnyBattery()
visible: batteryIndicator.isReady
NIcon {
icon: BatteryService.getIcon(Math.round(batteryIndicator.percent), batteryIndicator.charging, batteryIndicator.pluggedIn, batteryIndicator.isReady)
@@ -449,19 +449,19 @@ Item {
}
Item {
Layout.fillWidth: batteryIndicator.isReady && BatteryService.hasAnyBattery()
Layout.fillWidth: batteryIndicator.isReady
}
// Battery and Keyboard Layout (full mode only)
ColumnLayout {
Layout.alignment: (batteryIndicator.isReady && BatteryService.hasAnyBattery()) ? (Qt.AlignRight | Qt.AlignVCenter) : Qt.AlignVCenter
Layout.alignment: (batteryIndicator.isReady) ? (Qt.AlignRight | Qt.AlignVCenter) : Qt.AlignVCenter
spacing: Style.marginM
visible: (batteryIndicator.isReady && BatteryService.hasAnyBattery()) || keyboardLayout.currentLayout !== "Unknown"
visible: (batteryIndicator.isReady) || keyboardLayout.currentLayout !== "Unknown"
// Battery
RowLayout {
spacing: Style.marginXS
visible: batteryIndicator.isReady && BatteryService.hasAnyBattery()
visible: batteryIndicator.isReady
NIcon {
icon: BatteryService.getIcon(Math.round(batteryIndicator.percent), batteryIndicator.charging, batteryIndicator.pluggedIn, batteryIndicator.isReady)
Services/Hardware/BatteryService.qml
-4
View File
@@ -202,10 +202,6 @@ Singleton {
return "battery-off"; // New fallback icon clearly represent if nothing is true here.
}
function hasAnyBattery() {
return primaryDevice !== null;
}
function getRateText(device) {
if (!device || device.changeRate === undefined) {
return "";