diff options
author | extrawurst <mail@rusticorn.com> | 2022-08-17 21:46:55 +0200 |
---|---|---|
committer | extrawurst <776816+extrawurst@users.noreply.github.com> | 2022-08-17 22:12:39 +0200 |
commit | 8e54bfd3645a43dc2de4eccfb92e94b36d06f273 (patch) | |
tree | e6533699f303d7b0d480717247fd6f1dd3e79ad8 /src/ui | |
parent | 2eee7e9b0e16e88b46f74c598cc20693600a7c1b (diff) |
upgrade crossterm/tui
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/mod.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 1e8d3c47..cee73105 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -14,7 +14,7 @@ pub use stateful_paragraph::{ pub use syntax_text::{AsyncSyntaxJob, SyntaxText}; use tui::layout::{Constraint, Direction, Layout, Rect}; -use crate::keys::SharedKeyConfig; +use crate::keys::{key_match, SharedKeyConfig}; /// return the scroll position (line) necessary to have the `selection` in view if it is not already pub const fn calc_scroll_top( @@ -115,27 +115,27 @@ pub fn centered_rect_absolute( /// pub fn common_nav( - key: crossterm::event::KeyEvent, + key: &crossterm::event::KeyEvent, key_config: &SharedKeyConfig, ) -> Option<MoveSelection> { - if key == key_config.keys.move_down { + if key_match(key, key_config.keys.move_down) { Some(MoveSelection::Down) - } else if key == key_config.keys.move_up { + } else if key_match(key, key_config.keys.move_up) { Some(MoveSelection::Up) - } else if key == key_config.keys.page_up { + } else if key_match(key, key_config.keys.page_up) { Some(MoveSelection::PageUp) - } else if key == key_config.keys.page_down { + } else if key_match(key, key_config.keys.page_down) { Some(MoveSelection::PageDown) - } else if key == key_config.keys.move_right { + } else if key_match(key, key_config.keys.move_right) { Some(MoveSelection::Right) - } else if key == key_config.keys.move_left { + } else if key_match(key, key_config.keys.move_left) { Some(MoveSelection::Left) - } else if key == key_config.keys.home - || key == key_config.keys.shift_up + } else if key_match(key, key_config.keys.home) + || key_match(key, key_config.keys.shift_up) { Some(MoveSelection::Top) - } else if key == key_config.keys.end - || key == key_config.keys.shift_down + } else if key_match(key, key_config.keys.end) + || key_match(key, key_config.keys.shift_down) { Some(MoveSelection::End) } else { |