Merge branch 'master' into tui_focus

This commit is contained in:
Evan Almloff committed 2022-06-13 17:37:40 -05:00
commit ce385965a7
12 files changed
+35 -31

No files matched your search

+7 -2
View File
@@ -731,6 +731,7 @@ fn get_event(evt: TermEvent) -> Option<(&'static str, EventData)> {
fn translate_key_event(event: crossterm::event::KeyEvent) -> Option<EventData> {
let (code, key_str);
let mut shift_key = event.modifiers.contains(KeyModifiers::SHIFT);
if let TermKeyCode::Char(c) = event.code {
code = match c {
'A'..='Z' | 'a'..='z' => match c.to_ascii_uppercase() {
@@ -844,7 +845,11 @@ fn translate_key_event(event: crossterm::event::KeyEvent) -> Option<EventData> {
12 => KeyCode::F12,
_ => return None,
},
TermKeyCode::BackTab => KeyCode::Tab,
// backtab is Shift + Tab
TermKeyCode::BackTab => {
shift_key = true;
KeyCode::Tab
}
TermKeyCode::Null => return None,
_ => return None,
};
@@ -862,7 +867,7 @@ fn translate_key_event(event: crossterm::event::KeyEvent) -> Option<EventData> {
alt_key: event.modifiers.contains(KeyModifiers::ALT),
ctrl_key: event.modifiers.contains(KeyModifiers::CONTROL),
meta_key: false,
shift_key: event.modifiers.contains(KeyModifiers::SHIFT),
shift_key,
locale: Default::default(),
location: 0x00,
repeat: Default::default(),