Skip to content

Bugfix: Prevent typing "q" on search field quitting everything #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isbm merged 1 commit into from
Mar 9, 2026
Merged

Bugfix: Prevent typing "q" on search field quitting everything #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ljx/src/commands/view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl ViewApp {
}

fn handle_key(&mut self, key: KeyEvent) -> Result<bool> {
if !matches!(self.focus, Focus::Modal | Focus::SavePrompt | Focus::SaveError)
if self.focus == Focus::List
&& matches!(key.code, KeyCode::Char('q') | KeyCode::Char('Q'))
{
self.cancel_scan();
Expand Down Expand Up @@ -661,7 +661,7 @@ impl ViewApp {
for index in self.list_offset..end {
let style = if index == self.selected {
Style::default()
.fg(Color::Black)
.fg(Color::White)
.bg(Color::Indexed(28))
.add_modifier(Modifier::BOLD)
} else {
Expand Down Expand Up @@ -1452,27 +1452,25 @@ fn pane_block<'a>(title: &'a str, active: bool) -> Block<'a> {
let title_style = if active {
Style::default().fg(Color::Black).bg(Color::LightGreen)
} else {
Style::default().fg(Color::Indexed(28))
Style::default().fg(Color::Gray)
};
let border_style = if active {
Style::default().fg(Color::LightGreen)
} else {
Style::default().fg(Color::Indexed(28))
Style::default().fg(Color::Gray)
};

Block::default()
.title(Span::styled(title, title_style))
.borders(Borders::ALL)
.border_type(if active { BorderType::Double } else { BorderType::Plain })
.border_type(BorderType::Plain)
.border_style(border_style)
.style(Style::default().fg(Color::White))
}

fn status_help_spans(focus: Focus) -> Vec<Span<'static>> {
match focus {
Focus::Search => vec![
status_key("Q"),
status_text(" quit "),
status_key("TAB"),
status_text(" switch "),
status_key("ENTER"),
Expand Down