leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(battery): show plug icon without battery (#1432)

Browse source
This commit is contained in:
William Fish 2026-06-29 21:58:04 +01:00 • committed by GitHub
parent 1f7c59fb2b
commit 0441c67b10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cosmic-applet-battery/src/app.rs
View file

@ -40,7 +40,7 @@ use cosmic_settings_upower_subscription::{
};
use rustc_hash::FxHashMap;
use std::{path::PathBuf, sync::LazyLock, time::Duration};
use std::{path::PathBuf, time::Duration};
use tokio::sync::mpsc::UnboundedSender;
// XXX improve
@ -169,6 +169,20 @@ impl CosmicBatteryApplet {
self.charging_limit = Some(limit);
self.update_battery(self.battery_percent, self.on_battery);
}
fn panel_icon_name(&self) -> &str {
if self.no_battery {
if self.screen_brightness.is_some() {
self.display_icon_name.as_str()
} else if self.kbd_brightness.is_some() {
"keyboard-brightness-symbolic"
} else {
"plugged-into-power-symbolic"
}
} else {
self.icon_name.as_str()
}
}
}
#[derive(Debug, Clone)]
@ -521,17 +535,7 @@ impl cosmic::Application for CosmicBatteryApplet {
let applet_padding = self.core.applet.suggested_padding(true);
let mut children = vec![
icon::from_name(if self.no_battery {
if self.screen_brightness.is_some() {
self.display_icon_name.as_str()
} else if self.kbd_brightness.is_some() {
"keyboard-brightness-symbolic"
} else {
self.icon_name.as_str()
}
} else {
self.icon_name.as_str()
})
icon::from_name(self.panel_icon_name())
.size(suggested_size.0)
.into(),
];