From 9ea4b54993efc7352bd72e5547cc1c24e7d74382 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Wed, 3 Jan 2024 15:49:16 +0100 Subject: [PATCH] patch-list: Exit on Key::ESC --- bin/commands/issue/suite.rs | 5 ++++- bin/commands/patch/list.rs | 2 +- bin/commands/patch/list/event.rs | 15 +++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bin/commands/issue/suite.rs b/bin/commands/issue/suite.rs index 8ea2d915..da0aee14 100644 --- a/bin/commands/issue/suite.rs +++ b/bin/commands/issue/suite.rs @@ -310,7 +310,10 @@ impl Tui for App { app.mount( Cid::GlobalListener, global, - vec![Sub::new(subscription::quit_clause(Key::Char('q')), SubClause::Always)], + vec![Sub::new( + subscription::quit_clause(Key::Char('q')), + SubClause::Always, + )], )?; Ok(()) diff --git a/bin/commands/patch/list.rs b/bin/commands/patch/list.rs index 567f5909..c67362d3 100644 --- a/bin/commands/patch/list.rs +++ b/bin/commands/patch/list.rs @@ -196,7 +196,7 @@ impl Tui for App { Cid::GlobalListener, global, vec![Sub::new( - subscription::quit_clause(Key::Char('q')), + subscription::quit_clause(Key::Esc), SubClause::Always, )], )?; diff --git a/bin/commands/patch/list/event.rs b/bin/commands/patch/list/event.rs index 2055277b..f1231791 100644 --- a/bin/commands/patch/list/event.rs +++ b/bin/commands/patch/list/event.rs @@ -2,11 +2,13 @@ use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection}; use tuirealm::event::{Event, Key, KeyEvent}; use tuirealm::{MockComponent, NoUserEvent, State, StateValue}; -use radicle_tui::ui::widget::container::{AppHeader, GlobalListener, LabeledContainer, Popup}; -use radicle_tui::ui::widget::context::{ContextBar, Shortcuts}; -use radicle_tui::ui::widget::list::PropertyList; +use radicle_tui as tui; -use radicle_tui::ui::widget::Widget; +use tui::ui::widget::container::{AppHeader, GlobalListener, LabeledContainer, Popup}; +use tui::ui::widget::context::{ContextBar, Shortcuts}; +use tui::ui::widget::list::PropertyList; + +use tui::ui::widget::Widget; use super::{ui, Message, PopupMessage}; @@ -18,10 +20,7 @@ use super::{ui, Message, PopupMessage}; impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { match event { - Event::Keyboard(KeyEvent { - code: Key::Char('q'), - .. - }) => Some(Message::Quit(None)), + Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => Some(Message::Quit(None)), _ => None, } }