feat: support help popup display viewing progress

Author: wugeer

CHANGELOG.md

@@ -38,6 +38,7 @@ Checkout [THEMES.md](./THEMES.md) for more info.
 ### Added
 * due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separat artifact)
 * support `BUILD_GIT_COMMIT_ID` enabling builds from `git archive` generated source tarballs or other outside a git repo [[@alerque](https://github.com/alerque)] ([#2187](https://github.com/extrawurst/gitui/pull/2187))
+* support help popup display viewing progress[[@wugeer](https://github.com/wugeer)](https://github.com/extrawurst/gitui/pull/2388))
 
 ### Fixes
 * update yanked dependency to `libc` to fix building with `--locked`.

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

@@ -67,6 +67,15 @@ impl DrawableComponent for HelpPopup {
 				chunks[0],
 			);
 
+			ui::draw_scrollbar(
+				f,
+				area,
+				&self.theme,
+				self.cmds.len(),
+				self.selection as usize,
+				ui::Orientation::Vertical,
+			);
+
 			f.render_widget(
 				Paragraph::new(Line::from(vec![Span::styled(
 					Cow::from(format!(

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),