fix 'g' keybinding after if-let-arms refactor (#159)

* fix 'g' keybinding after if-let-arms refactor

* box error

src/converter.rs

@@ -72,7 +72,7 @@ pub async fn run_conversion_loop(
 	picker: Picker,
 	prerender: usize,
 	shms_work: bool
-) -> Result<(), SendError<Result<ConvertedPage, RenderError>>> {
+) -> Result<(), Box<SendError<Result<ConvertedPage, RenderError>>>> {
 	let mut images = vec![];
 	let mut page: usize = 0;
 	let pid = std::process::id();

src/tui.rs

@@ -262,7 +262,7 @@ impl Tui {
 			let img_page_w_ratio = img_section_w / initial_page_w;
 			let img_page_h_ratio = img_section_h / initial_page_h;
 
-			let shrink_move_page = |dim: &mut u16, pos: &mut u16, axis_zoom_factor: f32| {
+			fn shrink_move_page(dim: &mut u16, pos: &mut u16, axis_zoom_factor: f32) {
 				let old_dim = *dim;
 				// The axis zoom factor tells us what portion of the axis
 				// we need to show.
@@ -272,50 +272,56 @@ impl Tui {
 					.checked_sub(*dim)
 					.expect("zooming out should shrink the image")
 					/ 2;
-			};
+			}
 
-			if img_page_w_ratio < img_page_h_ratio {
+			fn shrink_move_two_pass(
+				zoom: &mut Zoom,
+				dim: &mut u16,
+				pos: &mut u16,
+				zoom_factor: f32,
+				axis_zoom_factor: f32
+			) {
 				// To detect if we're already at fit-screen, we perform a first
 				// pass on `img_area` that emulates the last call to
 				// `render_zoomed` by subtracting from the `zoom`'s level. This
 				// holds because the `img_area` that gets passed is always the
 				// same.
-				let mut first_pass_area = img_area;
+				let mut first_pass_dim = *dim;
+				let mut first_pass_pos = *pos;
 				let mut first_pass_zoom = *zoom;
+
 				if first_pass_zoom.level.is_negative() {
 					first_pass_zoom.step_in();
 				}
 				let first_pass_zoom_factor = first_pass_zoom.factor();
 				shrink_move_page(
-					&mut first_pass_area.width,
+					&mut first_pass_dim,
-					&mut first_pass_area.x,
+					&mut first_pass_pos,
-					first_pass_zoom_factor.max(1.0 / img_page_h_ratio)
+					first_pass_zoom_factor.max(1.0 / axis_zoom_factor)
 				);
-				log::debug!("first_pass_area: {first_pass_area:#?}");
+
+				log::debug!("first_pass_dim: {first_pass_dim}, first_pass_pos: {first_pass_pos}");
 				// vertical scroll / tall image. zooming out means decreasing
 				// the width of the page area
-				shrink_move_page(
+				// use `max` to disallow zooming out past fit-screen
-					&mut img_area.width,
+				shrink_move_page(dim, pos, zoom_factor.max(1.0 / axis_zoom_factor));
-					&mut img_area.x,
+
-					// disallow zooming out past fit-screen
+				log::debug!("new dim: {dim}, new pos: {pos}");
-					zoom_factor.max(1.0 / img_page_h_ratio)
-				);
-				log::debug!("img_area: {img_area:#?}");
 				// The moment the image area is left unmodified, we've hit
 				// fit-screen and the zoom level ought be normalized.
-				if first_pass_area == img_area {
+				if first_pass_dim == *dim && first_pass_pos == *pos {
 					zoom.step_in();
 				}
+			}
+
+			let (dim, pos, axis_zoom_factor) = if img_page_w_ratio < img_page_h_ratio {
+				(&mut img_area.width, &mut img_area.x, img_page_h_ratio)
 			} else {
 				// horizontal scroll / wide image. zooming out means decreasing
 				// the height of the page area
-				shrink_move_page(
+				(&mut img_area.height, &mut img_area.y, img_page_w_ratio)
-					&mut img_area.height,
+			};
-					&mut img_area.y,
+			shrink_move_two_pass(zoom, dim, pos, zoom_factor, axis_zoom_factor);
-					// disallow zooming out past fit-screen
-					zoom_factor.max(1.0 / img_page_w_ratio)
-				);
-			}
 		}
 		log::debug!("after adjustment, page area is {img_area:#?}");
 
@@ -733,19 +739,19 @@ impl Tui {
 						InputAction::Redraw.into()
 					}
 					KeyCode::Char(c)
-						if let BottomMessage::Input(InputCommand::GoToPage(ref mut page)) =
-							self.bottom_msg && matches!(c, 'g' if self.is_kitty) =>
-						c.to_digit(10).map(|input_num| {
-							*page = (*page * 10) + input_num as usize;
-							InputAction::Redraw
-						}),
-					KeyCode::Char(_)
 						if let BottomMessage::Input(InputCommand::GoToPage(_)) =
-							self.bottom_msg =>
+							self.bottom_msg && matches!(c, 'g' if self.is_kitty) =>
 					{
 						self.set_msg(MessageSetting::Pop);
 						self.update_zoom(Zoom::pan_bottom)
 					}
+					KeyCode::Char(c)
+						if let BottomMessage::Input(InputCommand::GoToPage(ref mut page)) =
+							self.bottom_msg =>
+						c.to_digit(10).map(|input_num| {
+							*page = (*page * 10) + input_num as usize;
+							InputAction::Redraw
+						}),
 					KeyCode::Char(c) => match c {
 						'l' => self.change_page(PageChange::Next, ChangeAmount::Single),
 						'j' => self.change_page(PageChange::Next, ChangeAmount::WholeScreen),