From 0ab5a524b024c375b4f259b47cd9d80e5a6f3919 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 12 Apr 2024 08:25:09 -0600
Subject: [PATCH] Fix overlap (#10474)

Although I liked the symmetry of the count in the middle of the arrows,
it's
tricky to make the buttons not occlude the count on hover, so go back to
this arrangement.

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs  | 27 ++++++++++-----------------
 crates/search/src/project_search.rs | 25 +++++++++++--------------
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index ae902b8a3309b70a17cc33d8142f3cfa22aef439..d467140dda37f8a63ead344421de6e2112583157 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -272,28 +272,21 @@ impl Render for BufferSearchBar {
                         "Select previous match",
                         &SelectPrevMatch,
                     ))
-                    .when(!narrow_mode, |this| {
-                        this.child(
-                            h_flex()
-                                .mx(rems_from_px(-4.0))
-                                .min_w(rems_from_px(40.))
-                                .justify_center()
-                                .items_center()
-                                .child(Label::new(match_text).color(
-                                    if self.active_match_index.is_some() {
-                                        Color::Default
-                                    } else {
-                                        Color::Disabled
-                                    },
-                                )),
-                        )
-                    })
                     .child(render_nav_button(
                         ui::IconName::ChevronRight,
                         self.active_match_index.is_some(),
                         "Select next match",
                         &SelectNextMatch,
-                    )),
+                    ))
+                    .when(!narrow_mode, |this| {
+                        this.child(h_flex().min_w(rems_from_px(40.)).child(
+                            Label::new(match_text).color(if self.active_match_index.is_some() {
+                                Color::Default
+                            } else {
+                                Color::Disabled
+                            }),
+                        ))
+                    }),
             );
 
         let replace_line = should_show_replace_input.then(|| {
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 8f6b7917200df05bf82654a2dbe4316ee5393883..f8f5e9f9c5e223f14505b9dfbfbf989ba07a681d 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1437,20 +1437,6 @@ impl Render for ProjectSearchBar {
                         Tooltip::for_action("Go to previous match", &SelectPrevMatch, cx)
                     }),
             )
-            .child(
-                h_flex()
-                    .mx(rems_from_px(-4.0))
-                    .min_w(rems_from_px(40.))
-                    .justify_center()
-                    .items_center()
-                    .child(
-                        Label::new(match_text).color(if search.active_match_index.is_some() {
-                            Color::Default
-                        } else {
-                            Color::Disabled
-                        }),
-                    ),
-            )
             .child(
                 IconButton::new("project-search-next-match", IconName::ChevronRight)
                     .disabled(search.active_match_index.is_none())
@@ -1463,6 +1449,17 @@ impl Render for ProjectSearchBar {
                     }))
                     .tooltip(|cx| Tooltip::for_action("Go to next match", &SelectNextMatch, cx)),
             )
+            .child(
+                h_flex()
+                    .min_w(rems_from_px(40.))
+                    .child(
+                        Label::new(match_text).color(if search.active_match_index.is_some() {
+                            Color::Default
+                        } else {
+                            Color::Disabled
+                        }),
+                    ),
+            )
             .when(limit_reached, |this| {
                 this.child(
                     div()