From 236e72df38348a4c229d7a8d320437043e518e04 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:57:55 -0300
Subject: [PATCH] Fix editor & assistant panel toolbar height mismatch (#15552)

This PR ensures that the toolbar within the editor and the assistant
panel have the same height. I also pushed in some other tiny design
(spacing, really) tweaks. There's still a mismatch between the editor
toolbar and the assistant panel's history tab, but I'll try to tackle
this separately.

---

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs | 3 ++-
 crates/workspace/src/toolbar.rs    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index cff5aa7fc8..cfd4ee1d9c 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -196,6 +196,7 @@ impl Render for BufferSearchBar {
         };
 
         let search_line = h_flex()
+            .mb_1()
             .child(
                 h_flex()
                     .id("editor-scroll")
@@ -295,7 +296,7 @@ impl Render for BufferSearchBar {
                         &SelectNextMatch,
                     ))
                     .when(!narrow_mode, |this| {
-                        this.child(h_flex().min_w(rems_from_px(40.)).child(
+                        this.child(h_flex().ml_2().min_w(rems_from_px(40.)).child(
                             Label::new(match_text).color(if self.active_match_index.is_some() {
                                 Color::Default
                             } else {
diff --git a/crates/workspace/src/toolbar.rs b/crates/workspace/src/toolbar.rs
index 3d65ceb431..e2f731b0b7 100644
--- a/crates/workspace/src/toolbar.rs
+++ b/crates/workspace/src/toolbar.rs
@@ -105,6 +105,7 @@ impl Render for Toolbar {
             .bg(cx.theme().colors().toolbar_background)
             .child(
                 h_flex()
+                    .min_h(rems_from_px(24.))
                     .justify_between()
                     .gap(Spacing::Large.rems(cx))
                     .when(has_left_items, |this| {