From f90679978247974e999b3cc3b808e64350cf5c8c Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Wed, 29 Mar 2023 17:20:20 +0000 Subject: [PATCH] fix: alter the help box link underlining --- src/app_data/mod.rs | 2 +- src/input_handler/mod.rs | 2 +- src/ui/draw_blocks.rs | 4 +--- src/ui/gui_state.rs | 2 +- src/ui/mod.rs | 10 +++++----- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index 9c662fc..dc80aeb 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -1,7 +1,7 @@ use bollard::models::ContainerSummary; use core::fmt; -use std::time::{SystemTime, UNIX_EPOCH}; use ratatui::widgets::{ListItem, ListState}; +use std::time::{SystemTime, UNIX_EPOCH}; mod container_state; diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs index 72bc374..696e3c9 100644 --- a/src/input_handler/mod.rs +++ b/src/input_handler/mod.rs @@ -8,11 +8,11 @@ use crossterm::{ execute, }; use parking_lot::Mutex; +use ratatui::layout::Rect; use tokio::{ sync::mpsc::{Receiver, Sender}, task::JoinHandle, }; -use ratatui::layout::Rect; mod message; use crate::{ diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs index fc79722..56286c5 100644 --- a/src/ui/draw_blocks.rs +++ b/src/ui/draw_blocks.rs @@ -628,7 +628,6 @@ impl HelpInfo { /// Generate the final lines, GitHub link etc, + metadata fn gen_final() -> Self { - let top_bar = (0..REPO.chars().count()).map(|_|"▔").collect::(); let spans = [ Self::empty_span(), Spans::from(vec![Self::black_span( @@ -636,9 +635,8 @@ impl HelpInfo { )]), Spans::from(vec![Span::styled( REPO.to_owned(), - Style::default().fg(Color::White), // .add_modifier(Modifier::BOLD), + Style::default().fg(Color::White).add_modifier(Modifier::UNDERLINED), )]), - Spans::from(vec![Self::white_span(&top_bar)]), ]; let height = spans.len(); let width = Self::calc_width(&spans); diff --git a/src/ui/gui_state.rs b/src/ui/gui_state.rs index 79b5e23..cb8571b 100644 --- a/src/ui/gui_state.rs +++ b/src/ui/gui_state.rs @@ -1,8 +1,8 @@ +use ratatui::layout::{Constraint, Rect}; use std::{ collections::{HashMap, HashSet}, fmt, }; -use ratatui::layout::{Constraint, Rect}; use uuid::Uuid; use crate::app_data::Header; diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 11a0d0e..ddee0c2 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -5,6 +5,11 @@ use crossterm::{ terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, }; use parking_lot::Mutex; +use ratatui::{ + backend::{Backend, CrosstermBackend}, + layout::{Constraint, Direction, Layout}, + Frame, Terminal, +}; use std::{ io::{self, Stdout, Write}, sync::{atomic::Ordering, Arc}, @@ -13,11 +18,6 @@ use std::{ use std::{sync::atomic::AtomicBool, time::Instant}; use tokio::sync::mpsc::Sender; use tracing::error; -use ratatui::{ - backend::{Backend, CrosstermBackend}, - layout::{Constraint, Direction, Layout}, - Frame, Terminal, -}; mod color_match; mod draw_blocks;