From cfddb7e223ce05ab916965abd72cebf40466058c Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Tue, 5 Jan 2021 22:18:56 -0500 Subject: [PATCH] bug: Fix hide table gap option not working in battery widget (#386) Fixes the `hide_table_gap` option not working with the battery widget. --- src/canvas/widgets/battery_display.rs | 21 +++++++++++++++------ 1 file 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, ); }