add VerticalScroll::visual_height

Author: xlai89

src/components/commit_details/details.rs

@@ -246,8 +246,7 @@ impl DetailsComponent {
 
 	fn move_scroll_top(&self, move_type: ScrollType) -> bool {
 		if self.data.is_some() {
-			let current_height = self.current_size.get().1 as usize;
-			self.scroll.move_top(move_type, Some(current_height))
+			self.scroll.move_top(move_type)
 		} else {
 			false
 		}
@@ -286,6 +285,7 @@ impl DrawableComponent for DetailsComponent {
 		let height = chunks[1].height.saturating_sub(border_width);
 
 		self.current_size.set((width, height));
+		self.scroll.set_visual_height(usize::from(height));
 
 		let number_of_lines = Self::get_number_of_lines(
 			self.data.as_ref(),
@@ -298,7 +298,7 @@ impl DrawableComponent for DetailsComponent {
 		);
 
 		if self.scroll_to_bottom_next_draw.get() {
-			self.scroll.move_top(ScrollType::End, None);
+			self.scroll.move_top(ScrollType::End);
 			self.scroll_to_bottom_next_draw.set(false);
 		}
 

src/components/utils/scroll_vertical.rs

@@ -8,16 +8,26 @@ use std::cell::Cell;
 pub struct VerticalScroll {
 	top: Cell<usize>,
 	max_top: Cell<usize>,
+	visual_height: Cell<usize>,
 }
 
 impl VerticalScroll {
 	pub const fn new() -> Self {
 		Self {
 			top: Cell::new(0),
 			max_top: Cell::new(0),
+			visual_height: Cell::new(0),
 		}
 	}
 
+	pub fn set_visual_height(&self, height: usize) {
+		self.visual_height.set(height);
+	}
+
+	pub fn get_visual_height(&self) -> usize {
+		self.visual_height.get()
+	}
+
 	pub fn get_top(&self) -> usize {
 		self.top.get()
 	}
@@ -26,23 +36,19 @@ impl VerticalScroll {
 		self.top.set(0);
 	}
 
-	pub fn move_top(
-		&self,
-		move_type: ScrollType,
-		page_height: Option<usize>,
-	) -> bool {
+	pub fn move_top(&self, move_type: ScrollType) -> bool {
 		let old = self.top.get();
 		let max = self.max_top.get();
 
 		let new_scroll_top = match move_type {
 			ScrollType::Down => old.saturating_add(1),
 			ScrollType::Up => old.saturating_sub(1),
-			ScrollType::PageDown => old.saturating_add(
-				page_height.unwrap_or(2).saturating_sub(1),
-			),
-			ScrollType::PageUp => old.saturating_sub(
-				page_height.unwrap_or(2).saturating_sub(1),
-			),
+			ScrollType::PageDown => old
+				.saturating_add(self.get_visual_height())
+				.saturating_sub(1),
+			ScrollType::PageUp => old
+				.saturating_sub(self.get_visual_height())
+				.saturating_add(1),
 			ScrollType::Home => 0,
 			ScrollType::End => max,
 		};

src/popups/msg.rs

@@ -141,10 +141,10 @@ impl Component for MsgPopup {
 					e,
 					self.key_config.keys.popup_down,
 				) {
-					self.scroll.move_top(ScrollType::Down, None);
+					self.scroll.move_top(ScrollType::Down);
 				} else if key_match(e, self.key_config.keys.popup_up)
 				{
-					self.scroll.move_top(ScrollType::Up, None);
+					self.scroll.move_top(ScrollType::Up);
 				}
 			}
 			Ok(EventState::Consumed)