From ef78a3a8ba797231e45b6807847594282fca90a2 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 30 Jan 2022 19:41:14 +0100 Subject: [PATCH] fix file log key events leaking through --- src/components/file_revlog.rs | 43 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/src/components/file_revlog.rs b/src/components/file_revlog.rs index 39687cb3..434dfa20 100644 --- a/src/components/file_revlog.rs +++ b/src/components/file_revlog.rs @@ -443,30 +443,25 @@ impl Component for FileRevlogComponent { Ok(EventState::Consumed) }, ); - } - - let selection_changed = - if key == self.key_config.keys.move_up { - self.move_selection(ScrollType::Up) - } else if key == self.key_config.keys.move_down { - self.move_selection(ScrollType::Down) - } else if key == self.key_config.keys.shift_up - || key == self.key_config.keys.home - { - self.move_selection(ScrollType::Home) - } else if key == self.key_config.keys.shift_down - || key == self.key_config.keys.end - { - self.move_selection(ScrollType::End) - } else if key == self.key_config.keys.page_up { - self.move_selection(ScrollType::PageUp) - } else if key == self.key_config.keys.page_down { - self.move_selection(ScrollType::PageDown) - } else { - false - }; - - return Ok(selection_changed.into()); + } else if key == self.key_config.keys.move_up { + self.move_selection(ScrollType::Up) + } else if key == self.key_config.keys.move_down { + self.move_selection(ScrollType::Down) + } else if key == self.key_config.keys.shift_up + || key == self.key_config.keys.home + { + self.move_selection(ScrollType::Home) + } else if key == self.key_config.keys.shift_down + || key == self.key_config.keys.end + { + self.move_selection(ScrollType::End) + } else if key == self.key_config.keys.page_up { + self.move_selection(ScrollType::PageUp) + } else if key == self.key_config.keys.page_down { + self.move_selection(ScrollType::PageDown) + } else { + false + }; } return Ok(EventState::Consumed);