meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

utilities/dialogs.rs: use conf shortcuts for scroll {up, down}

pull/144/head
Manos Pitsidianakis 2022-03-20 17:12:39 +02:00
parent a866b29499
commit d3e62e3d74
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/utilities/dialogs.rs
View File

@ -185,7 +185,9 @@ impl<T: 'static + PartialEq + Debug + Clone + Sync + Send> Component for UIDialo
} }
return true; return true;
} }
(UIEvent::Input(Key::Down), SelectorCursor::Unfocused) => { (UIEvent::Input(ref key), SelectorCursor::Unfocused)
if shortcut!(key == shortcuts["general"]["scroll_down"]) =>
{
if self.single_only { if self.single_only {
for c in self.content.row_iter(0..(width - 1), 0) { for c in self.content.row_iter(0..(width - 1), 0) {
self.content[c] self.content[c]
@ -206,7 +208,9 @@ impl<T: 'static + PartialEq + Debug + Clone + Sync + Send> Component for UIDialo
self.dirty = true; self.dirty = true;
return true; return true;
} }
(UIEvent::Input(Key::Up), SelectorCursor::Entry(c)) if c > 0 => { (UIEvent::Input(ref key), SelectorCursor::Entry(c))
if shortcut!(key == shortcuts["general"]["scroll_up"]) && c > 0 =>
{
if self.single_only { if self.single_only {
// Redraw selection // Redraw selection
for c in self.content.row_iter(0..(width - 1), c) { for c in self.content.row_iter(0..(width - 1), c) {
@ -506,7 +510,9 @@ impl Component for UIConfirmationDialog {
} }
return true; return true;
} }
(UIEvent::Input(Key::Up), SelectorCursor::Entry(c)) if c > 0 => { (UIEvent::Input(ref key), SelectorCursor::Entry(c))
if shortcut!(key == shortcuts["general"]["scroll_up"]) && c > 0 =>
{
if self.single_only { if self.single_only {
// Redraw selection // Redraw selection
for c in self.content.row_iter(0..(width - 1), c) { for c in self.content.row_iter(0..(width - 1), c) {
@ -856,10 +862,11 @@ impl<T: PartialEq + Debug + Clone + Sync + Send, F: 'static + Sync + Send> Selec
} }
fn draw(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) { fn draw(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
let shortcuts = context.settings.shortcuts.general.key_values();
let navigate_help_string = format!( let navigate_help_string = format!(
"Navigate options with {}, {}, select with {}", "Navigate options with {} to go down, {} to go up, select with {}",
Key::Up, shortcuts["scroll_down"],
Key::Down, shortcuts["scroll_up"],
Key::Char('\n') Key::Char('\n')
); );
let width = std::cmp::max( let width = std::cmp::max(