niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: button_item() include brackets

Browse Source
This commit is contained in:
Jack Wills
2023-03-29 18:00:31 +00:00
parent cb1271cf7f
commit 7c92ffef7d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/draw_blocks.rs
+18 -16
View File
@@ -515,12 +515,12 @@ impl HelpInfo {
Span::styled(input.to_owned(), Style::default().fg(color)) Span::styled(input.to_owned(), Style::default().fg(color))
} }
/// Span to black text span /// &str to black text span
fn black_span<'a>(input: &str) -> Span<'a> { fn black_span<'a>(input: &str) -> Span<'a> {
Self::span(input, Color::Black) Self::span(input, Color::Black)
} }
/// Span to white text span /// &str to white text span
fn white_span<'a>(input: &str) -> Span<'a> { fn white_span<'a>(input: &str) -> Span<'a> {
Self::span(input, Color::White) Self::span(input, Color::White)
} }
@@ -559,7 +559,7 @@ impl HelpInfo {
/// Generate the button information span + metadata /// Generate the button information span + metadata
fn gen_button() -> Self { fn gen_button() -> Self {
let button_item = |x: &str| Self::white_span(&format!(" {x} ")); let button_item = |x: &str| Self::white_span(&format!(" ( {x} ) "));
let button_desc = |x: &str| Self::black_span(x); let button_desc = |x: &str| Self::black_span(x);
let or = || button_desc("or"); let or = || button_desc("or");
let space = || button_desc(" "); let space = || button_desc(" ");
@@ -567,52 +567,52 @@ impl HelpInfo {
let spans = [ let spans = [
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( tab )"), button_item("tab"),
or(), or(),
button_item("( shift+tab )"), button_item("shift+tab"),
button_desc("to change panels"), button_desc("to change panels"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( ↑ ↓ )"), button_item("↑ ↓"),
or(), or(),
button_item("( j k )"), button_item("j k"),
or(), or(),
button_item("( PgUp PgDown )"), button_item("PgUp PgDown"),
or(), or(),
button_item("( Home End )"), button_item("Home End"),
button_desc("to change selected line"), button_desc("to change selected line"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( enter )"), button_item("enter"),
button_desc("to send docker container command"), button_desc("to send docker container command"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( h )"), button_item("h"),
button_desc("to toggle this help information"), button_desc("to toggle this help information"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( 0 )"), button_item("0"),
button_desc("to stop sort"), button_desc("to stop sort"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( 1 - 9 )"), button_item("1 - 9"),
button_desc("sort by header - or click header"), button_desc("sort by header - or click header"),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( m )"), button_item("m"),
button_desc( button_desc(
"to toggle mouse capture - if disabled, text on screen can be selected & copied", "to toggle mouse capture - if disabled, text on screen can be selected & copied",
), ),
]), ]),
Spans::from(vec![ Spans::from(vec![
space(), space(),
button_item("( q )"), button_item("q"),
button_desc("to quit at any time"), button_desc("to quit at any time"),
]), ]),
]; ];
@@ -635,7 +635,9 @@ impl HelpInfo {
)]), )]),
Spans::from(vec![Span::styled( Spans::from(vec![Span::styled(
REPO.to_owned(), REPO.to_owned(),
Style::default().fg(Color::White).add_modifier(Modifier::UNDERLINED), Style::default()
.fg(Color::White)
.add_modifier(Modifier::UNDERLINED),
)]), )]),
]; ];
let height = spans.len(); let height = spans.len();