llange
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

ui: Consume Esc input events only when necessary

async
Manos Pitsidianakis 2020-02-09 23:32:14 +02:00
parent 9757e523bd
commit 4090eecd04
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/contacts/contact_list.rs
View File

@ -726,7 +726,9 @@ impl Component for ContactList {
self.menu_visibility = !self.menu_visibility;
self.set_dirty(true);
}
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) => {
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt(''))
if !self.cmd_buf.is_empty() =>
{
self.cmd_buf.clear();
context
.replies

2
src/components/mail/listing.rs
View File

@ -816,7 +816,7 @@ impl Component for Listing {
self.get_status(context),
)));
}
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) => {
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) if !self.cmd_buf.is_empty() => {
self.cmd_buf.clear();
context
.replies

2
src/components/mail/view.rs
View File

@ -839,7 +839,7 @@ impl Component for MailView {
self.set_dirty(true);
return true;
}
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) => {
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) if !self.cmd_buf.is_empty() => {
self.cmd_buf.clear();
context
.replies

2
src/components/mail/view/envelope.rs
View File

@ -373,7 +373,7 @@ impl Component for EnvelopeView {
}
}
match *event {
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) => {
UIEvent::Input(Key::Esc) | UIEvent::Input(Key::Alt('')) if !self.cmd_buf.is_empty() => {
self.cmd_buf.clear();
context
.replies