diff options
author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-11-26 19:14:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-26 19:14:27 -0500 |
commit | 41b8dd61d0aa7d04f3d8b58b2529e75b99802bb8 (patch) | |
tree | 78cab18e200c2c6951076249263ac0fccc918a8d /src | |
parent | 380571cf7315ab14ac848448951234c662d502ba (diff) |
bug: Fix inverted battery colours (#331)
Fixes colour theming for batteries being flipped.
Diffstat (limited to 'src')
-rw-r--r-- | src/canvas/canvas_colours.rs | 35 | ||||
-rw-r--r-- | src/canvas/widgets/battery_display.rs | 19 |
2 files changed, 15 insertions, 39 deletions
diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs index 4979f597..316b8e3c 100644 --- a/src/canvas/canvas_colours.rs +++ b/src/canvas/canvas_colours.rs @@ -23,8 +23,9 @@ pub struct CanvasColours { pub text_style: Style, pub widget_title_style: Style, pub graph_style: Style, - // Full, Medium, Low - pub battery_bar_styles: Vec<Style>, + pub high_battery_colour: Style, + pub medium_battery_colour: Style, + pub low_battery_colour: Style, pub invalid_query_style: Style, pub disabled_text_style: Style, } @@ -65,18 +66,9 @@ impl Default for CanvasColours { text_style: Style::default().fg(text_colour), widget_title_style: Style::default().fg(text_colour), graph_style: Style::default().fg(text_colour), - battery_bar_styles: vec![ - Style::default().fg(Color::Red), - Style::default().fg(Color::Yellow), - Style::default().fg(Color::Yellow), - Style::default().fg(Color::Yellow), - Style::default().fg(Color::Green), - Style::default().fg(Color::Green), - Style::default().fg(Color::Green), - Style::default().fg(Color::Green), - Style::default().fg(Color::Green), - Style::default().fg(Color::Green), - ], + high_battery_colour: Style::default().fg(Color::Green), + medium_battery_colour: Style::default().fg(Color::Yellow), + low_battery_colour: Style::default().fg(Color::Red), invalid_query_style: Style::default().fg(tui::style::Color::Red), disabled_text_style: Style::default().fg(Color::DarkGray), } @@ -293,26 +285,17 @@ impl CanvasColours { } pub fn set_high_battery_color(&mut self, colour: &str) -> error::Result<()> { - let style = get_style_from_config(colour)?; - self.battery_bar_styles[0] = style; - self.battery_bar_styles[1] = style; - self.battery_bar_styles[2] = style; - self.battery_bar_styles[3] = style; - self.battery_bar_styles[4] = style; - self.battery_bar_styles[5] = style; + self.high_battery_colour = get_style_from_config(colour)?; Ok(()) } pub fn set_medium_battery_color(&mut self, colour: &str) -> error::Result<()> { - let style = get_style_from_config(colour)?; - self.battery_bar_styles[6] = style; - self.battery_bar_styles[7] = style; - self.battery_bar_styles[8] = style; + self.medium_battery_colour = get_style_from_config(colour)?; Ok(()) } pub fn set_low_battery_color(&mut self, colour: &str) -> error::Result<()> { - self.battery_bar_styles[9] = get_style_from_config(colour)?; + self.low_battery_colour = get_style_from_config(colour)?; Ok(()) } } diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs index ae911d42..473d378d 100644 --- a/src/canvas/widgets/battery_display.rs +++ b/src/canvas/widgets/battery_display.rs @@ -138,22 +138,15 @@ impl BatteryDisplayWidget for Painter { ["Health %", &battery_details.health], ]; - let battery_rows = battery_items.iter().enumerate().map(|(itx, item)| { + let battery_rows = battery_items.iter().map(|item| { Row::StyledData( item.iter(), - if itx == 0 { - let colour_index = ((charge_percentage - * self.colours.battery_bar_styles.len() as f64) - / 100.0) - .ceil() as usize - - 1; - *self - .colours - .battery_bar_styles - .get(colour_index) - .unwrap_or(&self.colours.text_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.text_style + self.colours.high_battery_colour }, ) }); |