Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow closing log with abort key

Browse source
This commit is contained in:
Joscha 2023-04-29 01:29:44 +02:00
parent 98cb1f2cbc
commit f3efff68f5
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cove/src/ui.rs
View file

@ -248,7 +248,7 @@ impl Ui {
// Key bindings list overrides any other bindings if visible // Key bindings list overrides any other bindings if visible
if self.key_bindings_visible { if self.key_bindings_visible {
if event.matches(&keys.general.abort) { if event.matches(&keys.general.abort) || event.matches(&keys.general.help) {
self.key_bindings_visible = false; self.key_bindings_visible = false;
return EventHandleResult::Redraw; return EventHandleResult::Redraw;
} }
@ -259,26 +259,28 @@ impl Ui {
return EventHandleResult::Continue; return EventHandleResult::Continue;
} }
// Other general bindings that override any other bindings
if event.matches(&keys.general.help) { if event.matches(&keys.general.help) {
self.key_bindings_visible = true; self.key_bindings_visible = true;
return EventHandleResult::Redraw; return EventHandleResult::Redraw;
} }
if event.matches(&keys.general.log) {
self.mode = match self.mode {
Mode::Main => Mode::Log,
Mode::Log => Mode::Main,
};
return EventHandleResult::Redraw;
}
match self.mode { match self.mode {
Mode::Main => { Mode::Main => {
if event.matches(&keys.general.log) {
self.mode = Mode::Log;
return EventHandleResult::Redraw;
}
if self.rooms.handle_input_event(&mut event, keys).await { if self.rooms.handle_input_event(&mut event, keys).await {
return EventHandleResult::Redraw; return EventHandleResult::Redraw;
} }
} }
Mode::Log => { Mode::Log => {
if event.matches(&keys.general.abort) || event.matches(&keys.general.log) {
self.mode = Mode::Main;
return EventHandleResult::Redraw;
}
let reaction = self let reaction = self
.log_chat .log_chat
.handle_input_event(&mut event, keys, false) .handle_input_event(&mut event, keys, false)