battery: Orange on low battery

This commit is contained in:
Kenny Levinsen
2019-08-12 01:48:00 +02:00
parent 4bc58623b7
commit 2f9534f75f
+7 -3
View File
@@ -192,10 +192,15 @@ impl ModuleImpl for UpowerBattery {
_time: &DateTime<Local>, _time: &DateTime<Local>,
) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error> { ) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error> {
buf.memset(bg); buf.memset(bg);
let inner = self.inner.lock().unwrap();
let text_color = Color::new(1.0, 1.0, 1.0, 1.0); let text_color = Color::new(1.0, 1.0, 1.0, 1.0);
let bar_color = match self.inner.lock().unwrap().state { let bar_color = match inner.state {
UpowerBatteryState::Discharging | UpowerBatteryState::Unknown => { UpowerBatteryState::Discharging | UpowerBatteryState::Unknown => {
Color::new(1.0, 1.0, 1.0, 1.0) if inner.capacity > 10.0 {
Color::new(1.0, 1.0, 1.0, 1.0)
} else {
Color::new(1.0, 0.5, 0.0, 1.0)
}
} }
UpowerBatteryState::Charging | UpowerBatteryState::Full => { UpowerBatteryState::Charging | UpowerBatteryState::Full => {
Color::new(0.5, 1.0, 0.5, 1.0) Color::new(0.5, 1.0, 0.5, 1.0)
@@ -205,7 +210,6 @@ impl ModuleImpl for UpowerBattery {
} }
}; };
let inner = self.inner.lock().unwrap();
self.font.draw_text( self.font.draw_text(
&mut buf.subdimensions((0, 0, 128, 24))?, &mut buf.subdimensions((0, 0, 128, 24))?,
bg, bg,