Mirrors/bottom
2
0
Fork 0
mirror of https://github.com/ClementTsang/bottom synced 2024-11-22 20:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

other: skip battery duration draw if unknown (#974)

Browse source 
* other: skip battery duration draw if unknown

* increase others

* update changelog
This commit is contained in:
Clement Tsang 2023-01-15 12:06:19 -05:00 committed by GitHub
parent 316891d476
commit 571ec08291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Changes
- [#974](https://github.com/ClementTsang/bottom/pull/974): Hide battery duration section if the value is unknown. Also update shortened text.
## Other
## [0.7.1] - 2023-01-06

2
src/app.rs
View file

@ -1183,7 +1183,7 @@ impl App {
'k' => self.on_up_key(),
'j' => self.on_down_key(),
'f' => {
self.frozen_state.toggle(&self.data_collection); // TODO: Unthawing should force a full data refresh and redraw immediately.
self.frozen_state.toggle(&self.data_collection); // TODO: Thawing should force a full data refresh and redraw immediately.
}
'c' => {
if let BottomWidgetType::Proc = self.current_widget.widget_type {

56
src/canvas/widgets/battery_display.rs
View file

@ -142,56 +142,52 @@ impl Painter {
format!("{}h {}m {}s", time.whole_hours(), num_minutes, num_seconds,)
}
let s: String; // Brought out due to lifetimes.
let time_text = {
let mut battery_rows = Vec::with_capacity(4);
battery_rows.push(Row::new(vec![
Cell::from("Charge %").style(self.colours.text_style),
Cell::from(bars).style(if charge_percentage < 10.0 {
self.colours.low_battery_colour
} else if charge_percentage < 50.0 {
self.colours.medium_battery_colour
} else {
self.colours.high_battery_colour
}),
]));
battery_rows.push(
Row::new(vec!["Consumption", &battery_details.watt_consumption])
.style(self.colours.text_style),
);
let s: String; // Keep string in scope.
{
let style = self.colours.text_style;
match &battery_details.battery_duration {
BatteryDuration::ToEmpty(secs) => {
if half_width > 25 {
s = long_time(*secs);
Row::new(vec!["Time to empty", &s]).style(style)
battery_rows.push(Row::new(vec!["Time to empty", &s]).style(style));
} else {
s = short_time(*secs);
Row::new(vec!["Empty", &s]).style(style)
battery_rows.push(Row::new(vec!["To empty", &s]).style(style));
}
}
BatteryDuration::ToFull(secs) => {
if half_width > 25 {
s = long_time(*secs);
Row::new(vec!["Time to full", &s]).style(style)
battery_rows.push(Row::new(vec!["Time to full", &s]).style(style));
} else {
s = short_time(*secs);
Row::new(vec!["Full", &s]).style(style)
}
}
BatteryDuration::Unknown => {
// TODO: Potentially just don't draw this?
if half_width > 20 {
Row::new(vec!["Time to full/empty", "N/A"]).style(style)
} else {
Row::new(vec!["Empty/full", "N/A"]).style(style)
battery_rows.push(Row::new(vec!["To full", &s]).style(style));
}
}
BatteryDuration::Unknown => {}
}
};
}
let battery_rows = vec![
Row::new(vec![
Cell::from("Charge %").style(self.colours.text_style),
Cell::from(bars).style(if charge_percentage < 10.0 {
self.colours.low_battery_colour
} else if charge_percentage < 50.0 {
self.colours.medium_battery_colour
} else {
self.colours.high_battery_colour
}),
]),
Row::new(vec!["Consumption", &battery_details.watt_consumption])
.style(self.colours.text_style),
time_text,
battery_rows.push(
Row::new(vec!["Health %", &battery_details.health])
.style(self.colours.text_style),
];
);
// Draw
f.render_widget(