Skip to content

Commit

Permalink
bug: Fix hide table gap option not working in battery widget (#386)
Browse files Browse the repository at this point in the history
Fixes the `hide_table_gap` option not working with the battery widget.

(cherry picked from commit cfddb7e)
  • Loading branch information
ClementTsang committed Jan 25, 2021
1 parent da6d499 commit 4eb86b7
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions src/canvas/widgets/battery_display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 ";
Expand Down Expand Up @@ -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,
);
}
Expand Down

0 comments on commit 4eb86b7

Please sign in to comment.