extend VerticalScroll::move_top with PageUp and PageDown

Author: xlai89

src/components/commit_details/details.rs

@@ -247,39 +247,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;
-			match move_type {
-				ScrollType::PageDown => {
-					let new_top =
-						self.scroll.get_top().saturating_add(
-							current_height.saturating_sub(1),
-						);
-					if self.scroll.get_top() == new_top {
-						return false;
-					}
-					self.scroll.move_area_to_visible(
-						current_height,
-						new_top,
-						new_top.saturating_add(current_height),
-					);
-					true
-				}
-				ScrollType::PageUp => {
-					let new_top =
-						self.scroll.get_top().saturating_sub(
-							current_height.saturating_sub(1),
-						);
-					if self.scroll.get_top() == new_top {
-						return false;
-					}
-					self.scroll.move_area_to_visible(
-						current_height,
-						new_top,
-						new_top.saturating_add(current_height),
-					);
-					true
-				}
-				_ => self.scroll.move_top(move_type),
-			}
+			self.scroll.move_top(move_type, Some(current_height))
 		} else {
 			false
 		}
@@ -330,7 +298,7 @@ impl DrawableComponent for DetailsComponent {
 		);
 
 		if self.scroll_to_bottom_next_draw.get() {
-			self.scroll.move_top(ScrollType::End);
+			self.scroll.move_top(ScrollType::End, None);
 			self.scroll_to_bottom_next_draw.set(false);
 		}
 

src/components/utils/scroll_vertical.rs

@@ -26,16 +26,25 @@ impl VerticalScroll {
 		self.top.set(0);
 	}
 
-	pub fn move_top(&self, move_type: ScrollType) -> bool {
+	pub fn move_top(
+		&self,
+		move_type: ScrollType,
+		page_height: Option<usize>,
+	) -> 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::Home => 0,
 			ScrollType::End => max,
-			_ => old,
 		};
 
 		let new_scroll_top = new_scroll_top.clamp(0, 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);
+					self.scroll.move_top(ScrollType::Down, None);
 				} else if key_match(e, self.key_config.keys.popup_up)
 				{
-					self.scroll.move_top(ScrollType::Up);
+					self.scroll.move_top(ScrollType::Up, None);
 				}
 			}
 			Ok(EventState::Consumed)