From 88f1234dd01f636e82c297da3e76519249b9ad42 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 31 May 2025 14:42:35 -0700 Subject: [PATCH] Adjust look of progress window --- boot_diags/src/app.rs | 4 ++-- boot_diags/src/components/progress.rs | 15 +++++++++++---- boot_diags/src/components/results.rs | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/boot_diags/src/app.rs b/boot_diags/src/app.rs index e77aab0..d767c89 100644 --- a/boot_diags/src/app.rs +++ b/boot_diags/src/app.rs @@ -751,10 +751,10 @@ fn get_chunks(r: Rect) -> Vec { chunks.push(centered_rect(60, 25, r)); // Progress - chunks.push(centered_rect(60, 80, chunks[1])); + chunks.push(centered_rect(60, 70, r)); // Results - chunks.push(centered_rect(60, 80, chunks[1])); + chunks.push(centered_rect(60, 70, r)); // Done chunks diff --git a/boot_diags/src/components/progress.rs b/boot_diags/src/components/progress.rs index 0366e78..e1817fb 100644 --- a/boot_diags/src/components/progress.rs +++ b/boot_diags/src/components/progress.rs @@ -16,7 +16,7 @@ use color_eyre::Result; use ratatui::{ Frame, - layout::Rect, + layout::{Alignment, Rect}, style::{Color, Style, Stylize}, text::{Line, Span}, widgets::{Block, Borders, Clear, Paragraph}, @@ -139,12 +139,19 @@ impl Component for Progress { }); // Build block - let block = Block::default() + let outer_block = Block::default() .borders(Borders::ALL) .style(Style::default().bold()); - let body = Paragraph::new(body_text).block(block); + let inner_block = Block::default() + .borders(Borders::NONE) + .style(Style::default().bold()) + .title("Progress") + .title_alignment(Alignment::Center); + let inner = outer_block.inner(area); + let body = Paragraph::new(body_text).block(inner_block); frame.render_widget(Clear, area); - frame.render_widget(body, area); + frame.render_widget(outer_block, area); + frame.render_widget(body, inner); Ok(()) } } diff --git a/boot_diags/src/components/results.rs b/boot_diags/src/components/results.rs index f99fcab..22b0f9a 100644 --- a/boot_diags/src/components/results.rs +++ b/boot_diags/src/components/results.rs @@ -93,6 +93,7 @@ impl Component for Results { } fn draw(&mut self, frame: &mut Frame, rect: Rect) -> Result<()> { + return Ok(()); if !self.show { return Ok(()); }