From 94ac84a908eb74bce91bd24e5e0b7fde187f8167 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:28:35 +0200
Subject: [PATCH] Fix borders being cut off in buffer search

---
 crates/search/src/buffer_search.rs | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 681c098a37f40fe0297dc4e7236d164f456d2675..33c6c1ec8563b5e82de80435f13ae092c24399de 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -300,18 +300,28 @@ impl View for BufferSearchBar {
                 Flex::column().with_child(
                     Flex::row()
                         .align_children_center()
-                        .with_child(search_button_for_mode(SearchMode::Text, cx))
-                        .with_child(search_button_for_mode(SearchMode::Regex, cx))
-                        .with_child(super::search_bar::render_close_button(
-                            "Dismiss Buffer Search",
-                            &theme.search,
-                            cx,
-                            |_, this, cx| this.dismiss(&Default::default(), cx),
-                            Some(Box::new(Dismiss)),
-                        ))
+                        .with_child(
+                            Flex::row()
+                                .with_child(search_button_for_mode(SearchMode::Text, cx))
+                                .with_child(search_button_for_mode(SearchMode::Regex, cx))
+                                .aligned()
+                                .left()
+                                .contained()
+                                .with_margin_right(3.),
+                        )
+                        .with_child(
+                            super::search_bar::render_close_button(
+                                "Dismiss Buffer Search",
+                                &theme.search,
+                                cx,
+                                |_, this, cx| this.dismiss(&Default::default(), cx),
+                                Some(Box::new(Dismiss)),
+                            )
+                            .aligned()
+                            .right(),
+                        )
                         .constrained()
                         .with_height(theme.search.search_bar_row_height)
-                        .contained()
                         .aligned()
                         .right()
                         .top()