From 5054d0768dfad935f382d3fb9bf0ea6b1aabde10 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 14:02:28 -0400 Subject: [PATCH] Revert "git_panel: Pad end of list to avoid obscuring final entry with horizontal scrollbar (#28823)" (cherry-pick #28971) (#28985) Cherry-picked Revert "git_panel: Pad end of list to avoid obscuring final entry with horizontal scrollbar (#28823)" (#28971) This reverts commit 1d98b33ae07a72e9e26dc9b0b54a8baa4fd5f8c1. Not sure why, but seems like this breaks the binary search used to correlate items to each other in the lists. Release Notes: - N/A Co-authored-by: Conrad Irwin --- crates/git_ui/src/git_panel.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs index 80120d41f45cb9ec973a429d7a1e0bb887029bc6..a2a776a29ce0c62abb7a1639b39f66f4dbcc5ee5 100644 --- a/crates/git_ui/src/git_panel.rs +++ b/crates/git_ui/src/git_panel.rs @@ -604,7 +604,7 @@ impl GitPanel { if let Ok(ix) = self.entries[conflicted_start..conflicted_start + self.conflicted_count] .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path)) { - return Some(ix); + return Some(conflicted_start + ix); } } if self.tracked_count > 0 { @@ -616,7 +616,7 @@ impl GitPanel { if let Ok(ix) = self.entries[tracked_start..tracked_start + self.tracked_count] .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path)) { - return Some(ix); + return Some(tracked_start + ix); } } if self.new_count > 0 { @@ -632,7 +632,7 @@ impl GitPanel { if let Ok(ix) = self.entries[untracked_start..untracked_start + self.new_count] .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path)) { - return Some(ix); + return Some(untracked_start + ix); } } None