vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Close popups also with <ENTER>

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-25 10:00:24 +01:00
parent 96a395615b
commit 76c4f1b67f
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/activities/auth_activity/input.rs
View File

@@ -405,7 +405,7 @@ impl AuthActivity {
pub(super) fn handle_input_event_mode_popup_alert(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_alert(&mut self, ev: &InputEvent) {
// Only enter should be allowed here // Only enter should be allowed here
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
if let KeyCode::Enter = key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
self.input_mode = InputMode::Form; // Hide popup self.input_mode = InputMode::Form; // Hide popup
} }
} }
@@ -417,12 +417,9 @@ impl AuthActivity {
pub(super) fn handle_input_event_mode_popup_help(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_help(&mut self, ev: &InputEvent) {
// If enter, close popup // If enter, close popup
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
match key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
KeyCode::Enter | KeyCode::Esc => { // Set input mode back to form
// Set input mode back to form self.input_mode = InputMode::Form;
self.input_mode = InputMode::Form;
}
_ => { /* Nothing to do */ }
} }
} }
} }

22
src/ui/activities/filetransfer_activity/input.rs
View File

@@ -605,7 +605,7 @@ impl FileTransferActivity {
pub(super) fn handle_input_event_mode_popup_alert(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_alert(&mut self, ev: &InputEvent) {
// If enter, close popup // If enter, close popup
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
if let KeyCode::Enter = key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
// Set input mode back to explorer // Set input mode back to explorer
self.input_mode = InputMode::Explorer; self.input_mode = InputMode::Explorer;
} }
@@ -618,12 +618,9 @@ impl FileTransferActivity {
pub(super) fn handle_input_event_mode_popup_fileinfo(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_fileinfo(&mut self, ev: &InputEvent) {
// If enter, close popup // If enter, close popup
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
match key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
KeyCode::Enter | KeyCode::Esc => { // Set input mode back to explorer
// Set input mode back to explorer self.input_mode = InputMode::Explorer;
self.input_mode = InputMode::Explorer;
}
_ => { /* Nothing to do */ }
} }
} }
} }
@@ -634,12 +631,9 @@ impl FileTransferActivity {
pub(super) fn handle_input_event_mode_popup_help(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_help(&mut self, ev: &InputEvent) {
// If enter, close popup // If enter, close popup
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
match key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
KeyCode::Enter | KeyCode::Esc => { // Set input mode back to explorer
// Set input mode back to explorer self.input_mode = InputMode::Explorer;
self.input_mode = InputMode::Explorer;
}
_ => { /* Nothing to do */ }
} }
} }
} }
@@ -650,7 +644,7 @@ impl FileTransferActivity {
pub(super) fn handle_input_event_mode_popup_fatal(&mut self, ev: &InputEvent) { pub(super) fn handle_input_event_mode_popup_fatal(&mut self, ev: &InputEvent) {
// If enter, close popup // If enter, close popup
if let InputEvent::Key(key) = ev { if let InputEvent::Key(key) = ev {
if let KeyCode::Enter = key.code { if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
// Set quit to true; since a fatal error happened // Set quit to true; since a fatal error happened
self.disconnect(); self.disconnect();
} }