summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2021-01-05 22:18:56 -0500
committerClementTsang <cjhtsang@uwaterloo.ca>2021-01-25 01:31:05 -0500
commit4eb86b7601b6e89a3862c3d079f3706a5668c111 (patch)
tree60ef4dc2f7f3ce69174d3ef9255e8da2ca8542eb
parentda6d4992fb70d2eb07979f10e5067bd349ebc233 (diff)
bug: Fix hide table gap option not working in battery widget (#386)
Fixes the `hide_table_gap` option not working with the battery widget. (cherry picked from commit cfddb7e223ce05ab916965abd72cebf40466058c)
-rw-r--r--src/canvas/widgets/battery_display.rs21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
index 473d378d..8672ea1f 100644
--- a/src/canvas/widgets/battery_display.rs
+++ b/src/canvas/widgets/battery_display.rs
@@ -35,6 +35,11 @@ impl BatteryDisplayWidget for Painter {
} else {
self.colours.border_style
};
+ let table_gap = if draw_loc.height < TABLE_GAP_HEIGHT_LIMIT {
+ 0
+ } else {
+ app_state.app_config_fields.table_gap
+ };
let title = if app_state.is_expanded {
const TITLE_BASE: &str = " Battery ── Esc to go back ";
@@ -156,16 +161,20 @@ impl BatteryDisplayWidget for Painter {
Table::new([""].iter(), battery_rows)
.block(battery_block)
.header_style(self.colours.table_header_style)
- .widths(&[Constraint::Percentage(50), Constraint::Percentage(50)]),
+ .widths(&[Constraint::Percentage(50), Constraint::Percentage(50)])
+ .header_gap(table_gap),
margined_draw_loc,
);
} else {
+ let mut contents = vec![Spans::default(); table_gap as usize];
+
+ contents.push(Spans::from(Span::styled(
+ "No data found for this battery",
+ self.colours.text_style,
+ )));
+
f.render_widget(
- Paragraph::new(Span::styled(
- "No data found for this battery",
- self.colours.text_style,
- ))
- .block(battery_block),
+ Paragraph::new(contents).block(battery_block),
margined_draw_loc,
);
}