From 81ece4fd44cc4153e1e3514e352382ef83cba284 Mon Sep 17 00:00:00 2001
From: Petros Amoiridis <petros@zed.dev>
Date: Wed, 22 Feb 2023 20:28:57 +0200
Subject: [PATCH] Deduplicate tab theme related code

We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.

We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
---
 crates/search/src/project_search.rs | 8 +++-----
 crates/theme/src/theme.rs           | 2 --
 styles/src/styleTree/search.ts      | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index b2e3c81bc98eeec0531b1f6cebbdd1fbd5d3398e..04f4b1470a72b1675def55f1af08df2fb220b760 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -248,15 +248,15 @@ impl Item for ProjectSearchView {
         tab_theme: &theme::Tab,
         cx: &gpui::AppContext,
     ) -> ElementBox {
-        let settings = cx.global::<Settings>();
-        let search_theme = &settings.theme.search;
         Flex::row()
             .with_child(
                 Svg::new("icons/magnifying_glass_12.svg")
                     .with_color(tab_theme.label.text.color)
                     .constrained()
-                    .with_width(search_theme.tab_icon_width)
+                    .with_width(tab_theme.icon_width)
                     .aligned()
+                    .contained()
+                    .with_margin_right(tab_theme.spacing)
                     .boxed(),
             )
             .with_children(self.model.read(cx).active_query.as_ref().map(|query| {
@@ -264,8 +264,6 @@ impl Item for ProjectSearchView {
 
                 Label::new(query_text, tab_theme.label.clone())
                     .aligned()
-                    .contained()
-                    .with_margin_left(search_theme.tab_icon_spacing)
                     .boxed()
             }))
             .boxed()
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index bc338bbe269369f29fdea1d5794d30c172d2e316..72ec15bb22c86014a2a15b5fedb5c56f831eb7ad 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -246,8 +246,6 @@ pub struct Search {
     pub match_background: Color,
     pub match_index: ContainedText,
     pub results_status: TextStyle,
-    pub tab_icon_width: f32,
-    pub tab_icon_spacing: f32,
     pub dismiss_button: Interactive<IconButton>,
 }
 
diff --git a/styles/src/styleTree/search.ts b/styles/src/styleTree/search.ts
index 2edd3807a53928bf01b796e0e9d306f27c03a420..5d5f2111dc787c9099ef289468f38c111a03a1e3 100644
--- a/styles/src/styleTree/search.ts
+++ b/styles/src/styleTree/search.ts
@@ -29,8 +29,6 @@ export default function search(colorScheme: ColorScheme) {
   return {
     // TODO: Add an activeMatchBackground on the rust side to differenciate between active and inactive
     matchBackground: withOpacity(foreground(layer, "accent"), 0.4),
-    tabIconSpacing: 8,
-    tabIconWidth: 14,
     optionButton: {
       ...text(layer, "mono", "on"),
       background: background(layer, "on"),