From 96da7e1da81211a07ad4c44be6a1c07c1a893700 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Wed, 10 Apr 2024 13:02:05 +0530 Subject: [PATCH] Fix linting --- src/app.rs | 3 +-- src/directory_buffer.rs | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/app.rs b/src/app.rs index ec3cd0f..19e3268 100644 --- a/src/app.rs +++ b/src/app.rs @@ -915,8 +915,7 @@ impl App { dir.scroll_state.set_focus(0); } } else { - dir.scroll_state - .set_focus(dir.scroll_state.get_focus() + 1); + dir.scroll_state.set_focus(dir.scroll_state.get_focus() + 1); } }; Ok(self) diff --git a/src/directory_buffer.rs b/src/directory_buffer.rs index b9764bf..aa60eeb 100644 --- a/src/directory_buffer.rs +++ b/src/directory_buffer.rs @@ -12,7 +12,6 @@ pub struct ScrollState { } impl ScrollState { - pub fn set_focus(&mut self, current_focus: usize) { self.last_focus = Some(self.current_focus); self.current_focus = current_focus; @@ -48,9 +47,9 @@ impl ScrollState { .saturating_sub(preview_cushion + 1) .min(total.saturating_sub(preview_cushion + 1)); - let new_skipped_rows = if !vimlike_scrolling { + if !vimlike_scrolling { height * (self.current_focus / height.max(1)) - } else if last_focus == None { + } else if last_focus.is_none() { // Just entered the directory 0 } else if current_focus == 0 { @@ -86,9 +85,7 @@ impl ScrollState { } else { // If nothing matches; do nothing first_visible_row - }; - - new_skipped_rows + } } }