feat: help popup display viewing progress

Author: wugeer

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 * add popups for viewing, adding, updating and removing remotes [[@robin-thoene](https://github.com/robin-thoene)] ([#2172](https://github.com/extrawurst/gitui/issues/2172))
+* help popup display viewing progress[[@wugeer](https://github.com/wugeer)]
 
 ## [0.26.3] - 2024-06-02
 

asyncgit/src/sync/commit_filter.rs

@@ -214,8 +214,7 @@ pub fn filter_commit_by_search(
 
 			Ok(msg_summary_match
 				|| msg_body_match
-				|| file_match
-				|| authors_match)
+				|| file_match || authors_match)
 		},
 	))
 }

src/popups/help.rs

@@ -70,8 +70,12 @@ impl DrawableComponent for HelpPopup {
 			f.render_widget(
 				Paragraph::new(Line::from(vec![Span::styled(
 					Cow::from(format!(
-						"gitui {}",
+						"gitui {} {}%",
 						env!("GITUI_BUILD_NAME"),
+						rounded_div(
+							((self.selection + 1) as usize) * 100,
+							self.cmds.len()
+						)
 					)),
 					Style::default(),
 				)]))
@@ -84,6 +88,14 @@ impl DrawableComponent for HelpPopup {
 	}
 }
 
+const fn rounded_div(numerator: usize, denominator: usize) -> usize {
+	if numerator % denominator >= (denominator / 2) {
+		numerator / denominator + 1
+	} else {
+		numerator / denominator
+	}
+}
+
 impl Component for HelpPopup {
 	fn commands(
 		&self,

src/popups/remotelist.rs

@@ -245,8 +245,7 @@ impl RemoteListPopup {
 				.enumerate()
 				.map(|(i, remote)| {
 					let selected = (self.selection as usize
-						- self.scroll.get_top())
-						== i;
+						- self.scroll.get_top()) == i;
 					let mut remote_name = remote.clone();
 					if remote_name.len()
 						> name_length

src/tabs/status.rs

@@ -686,8 +686,7 @@ impl Status {
 				strings::commands::select_staging(&self.key_config),
 				!focus_on_diff,
 				(self.visible
-					&& !focus_on_diff
-					&& self.focus == Focus::WorkDir)
+					&& !focus_on_diff && self.focus == Focus::WorkDir)
 					|| force_all,
 			)
 			.order(strings::order::NAV),
@@ -697,8 +696,7 @@ impl Status {
 				strings::commands::select_unstaged(&self.key_config),
 				!focus_on_diff,
 				(self.visible
-					&& !focus_on_diff
-					&& self.focus == Focus::Stage)
+					&& !focus_on_diff && self.focus == Focus::Stage)
 					|| force_all,
 			)
 			.order(strings::order::NAV),