diff options
author | Ellie Huxtable <ellie@elliehuxtable.com> | 2024-01-10 14:07:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-10 14:07:40 +0000 |
commit | 6dda16d04787e15cb3ded696e732c623e116fabb (patch) | |
tree | 7276bac02a23a99fc0e33e9805013e24d1088ea9 | |
parent | 99f76ced50567338922292eb0617089940997b08 (diff) |
feat: add extended help (#1540)
Given some of the questions we've had lately, I think it's sensible to
add extended help to the top of the Atuin window.
Future plans: Ctrl-<something else> to open up a help popup, with all
common keys
-rw-r--r-- | atuin/src/command/client/search/interactive.rs | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/atuin/src/command/client/search/interactive.rs b/atuin/src/command/client/search/interactive.rs index a6275aac..7d0c2959 100644 --- a/atuin/src/command/client/search/interactive.rs +++ b/atuin/src/command/client/search/interactive.rs @@ -390,9 +390,9 @@ impl State { .direction(Direction::Horizontal) .constraints( [ - Constraint::Ratio(1, 3), - Constraint::Ratio(1, 3), - Constraint::Ratio(1, 3), + Constraint::Ratio(1, 5), + Constraint::Ratio(3, 5), + Constraint::Ratio(1, 5), ] .as_ref(), ) @@ -429,29 +429,37 @@ impl State { fn build_title(&mut self) -> Paragraph { let title = if self.update_needed.is_some() { - let version = self.update_needed.clone().unwrap(); - Paragraph::new(Text::from(Span::styled( - format!(" Atuin v{VERSION} - UPDATE AVAILABLE {version}"), + format!("Atuin v{VERSION} - UPGRADE"), Style::default().add_modifier(Modifier::BOLD).fg(Color::Red), ))) } else { Paragraph::new(Text::from(Span::styled( - format!(" Atuin v{VERSION}"), + format!("Atuin v{VERSION}"), Style::default().add_modifier(Modifier::BOLD), ))) }; - title + title.alignment(Alignment::Left) } #[allow(clippy::unused_self)] fn build_help(&mut self) -> Paragraph { let help = Paragraph::new(Text::from(Line::from(vec![ - Span::styled("Esc", Style::default().add_modifier(Modifier::BOLD)), - Span::raw(" to exit"), + Span::styled("<esc>", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(": exit"), + Span::raw(", "), + Span::styled("<tab>", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(": edit"), + Span::raw(", "), + Span::styled("<enter>", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(": execute"), + Span::raw(", "), + Span::styled("<ctrl-r>", Style::default().add_modifier(Modifier::BOLD)), + Span::raw(": filter toggle"), ]))) .style(Style::default().fg(Color::DarkGray)) .alignment(Alignment::Center); + help } |