Move match index before the navigation buttons

Antonio Scandurra and Nathan Sobo created 4 years ago

Co-Authored-By: Nathan Sobo <[e-mail]>

Change summary

crates/find/src/find.rs             | 14 +++++++-------
crates/zed/assets/themes/_base.toml |  1 -
2 files changed, 7 insertions(+), 8 deletions(-)

Detailed changes

crates/find/src/find.rs

@@ -111,6 +111,13 @@ impl View for FindBar {
                     .aligned()
                     .boxed(),
             )
+            .with_child(
+                Flex::row()
+                    .with_child(self.render_nav_button("<", Direction::Prev, cx))
+                    .with_child(self.render_nav_button(">", Direction::Next, cx))
+                    .aligned()
+                    .boxed(),
+            )
             .with_children(self.active_editor.as_ref().and_then(|editor| {
                 let (_, highlighted_ranges) =
                     editor.read(cx).highlighted_ranges_for_type::<Self>()?;
@@ -128,13 +135,6 @@ impl View for FindBar {
                         .boxed(),
                 )
             }))
-            .with_child(
-                Flex::row()
-                    .with_child(self.render_nav_button("<", Direction::Prev, cx))
-                    .with_child(self.render_nav_button(">", Direction::Next, cx))
-                    .aligned()
-                    .boxed(),
-            )
             .contained()
             .with_style(theme.find.container)
             .constrained()

crates/zed/assets/themes/_base.toml

@@ -353,7 +353,6 @@ background = "$surface.2"
 [find.match_index]
 extends = "$text.1"
 padding = 6
-margin.left = 24
 
 [find.editor]
 max_width = 400