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

battery: Better formatting for time to empty

Browse source
This commit is contained in:
Ian Douglas Scott 2022-06-21 19:10:20 -07:00
parent e46abe4dc3
commit 0348d7a93d
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
applets/cosmic-applet-power-battery/src/main.rs
View file

@ -20,6 +20,22 @@ async fn display_device() -> zbus::Result<DeviceProxy<'static>> {
.await
}
// XXX improve
// TODO: time to empty varies? needs averaging?
fn format_duration(duration: Duration) -> String {
let secs = duration.as_secs();
if secs > 60 {
let min = secs / 60;
if min > 60 {
format!("{}:{}", min / 60, min % 60)
} else {
format!("{}m", min)
}
} else {
format!("{}s", secs)
}
}
#[derive(Default)]
struct AppModel {
icon_name: String,
@ -73,10 +89,9 @@ impl SimpleComponent for AppModel {
},
gtk4::Label {
set_halign: gtk4::Align::Start,
// XXX duration formatting
// XXX time to full, fully changed, etc.
#[watch]
set_label: &format!("{:?} until empty ({:.0}%)", model.time_remaining, model.battery_percent),
set_label: &format!("{} until empty ({:.0}%)", format_duration(model.time_remaining), model.battery_percent),
},
},
},