fix CHANGELOG.md conflict

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))
+* When the terminal is insufficient to display all the commands, the cmdbar_bg configuration color does not fully take effect. ([#2347](https://github.com/extrawurst/gitui/issues/2347))
 
 ## [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/cmdbar.rs

@@ -20,7 +20,6 @@ enum DrawListEntry {
 struct Command {
 	txt: String,
 	enabled: bool,
-	line: usize,
 }
 
 /// helper to be used while drawing
@@ -106,7 +105,6 @@ impl CommandBar {
 			self.draw_list.push(DrawListEntry::Command(Command {
 				txt: c.text.name.to_string(),
 				enabled: c.enabled,
-				line: lines.saturating_sub(1) as usize,
 			}));
 		}
 
@@ -157,9 +155,7 @@ impl CommandBar {
 							DrawListEntry::Command(c) => {
 								Span::styled(
 									Cow::from(c.txt.as_str()),
-									self.theme.commandbar(
-										c.enabled, c.line,
-									),
+									self.theme.commandbar(c.enabled),
 								)
 							}
 							DrawListEntry::LineBreak => {

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

src/ui/style.rs

@@ -16,7 +16,6 @@ pub struct Theme {
 	selection_bg: Color,
 	selection_fg: Color,
 	cmdbar_bg: Color,
-	cmdbar_extra_lines_bg: Color,
 	disabled_fg: Color,
 	diff_line_add: Color,
 	diff_line_delete: Color,
@@ -204,17 +203,13 @@ impl Theme {
 		self.line_break.clone()
 	}
 
-	pub fn commandbar(&self, enabled: bool, line: usize) -> Style {
+	pub fn commandbar(&self, enabled: bool) -> Style {
 		if enabled {
 			Style::default().fg(self.command_fg)
 		} else {
 			Style::default().fg(self.disabled_fg)
 		}
-		.bg(if line == 0 {
-			self.cmdbar_bg
-		} else {
-			self.cmdbar_extra_lines_bg
-		})
+		.bg(self.cmdbar_bg)
 	}
 
 	pub fn commit_hash(&self, selected: bool) -> Style {
@@ -335,7 +330,6 @@ impl Default for Theme {
 			selection_bg: Color::Blue,
 			selection_fg: Color::White,
 			cmdbar_bg: Color::Blue,
-			cmdbar_extra_lines_bg: Color::Blue,
 			disabled_fg: Color::DarkGray,
 			diff_line_add: Color::Green,
 			diff_line_delete: Color::Red,