From dacd919e27aebbdc3dd466e395d6afbfd514b32a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 2 Dec 2024 07:48:10 -0300
Subject: [PATCH] Add setting for making the tab's close button always visible
 (#21352)

Closes https://github.com/zed-industries/zed/issues/20422

<img width="700" alt="Screenshot 2024-11-29 at 22 00 20"
src="https://github.com/user-attachments/assets/4a17d00c-d64f-4b33-97a7-a57766ce6d17">

Release Notes:

- N/A
---
 assets/settings/default.json | 2 ++
 crates/workspace/src/item.rs | 5 +++++
 crates/workspace/src/pane.rs | 8 ++++++--
 docs/src/configuring-zed.md  | 9 ++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index b844be7fa2..5930537856 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -559,6 +559,8 @@
     "close_position": "right",
     // Whether to show the file icon for a tab.
     "file_icons": false,
+    // Whether to always show the close button on tabs.
+    "always_show_close_button": false,
     // What to do after closing the current tab.
     //
     // 1. Activate the tab that was open previously (default)
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 40d92666a0..eab3ddc755 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -42,6 +42,7 @@ pub struct ItemSettings {
     pub close_position: ClosePosition,
     pub activate_on_close: ActivateOnClose,
     pub file_icons: bool,
+    pub always_show_close_button: bool,
 }
 
 #[derive(Deserialize)]
@@ -85,6 +86,10 @@ pub struct ItemSettingsContent {
     ///
     /// Default: history
     pub activate_on_close: Option<ActivateOnClose>,
+    /// Whether to always show the close button on tabs.
+    ///
+    /// Default: false
+    always_show_close_button: Option<bool>,
 }
 
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 66db71553f..83cc911a91 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1951,7 +1951,9 @@ impl Pane {
         };
 
         let icon = item.tab_icon(cx);
-        let close_side = &ItemSettings::get_global(cx).close_position;
+        let settings = ItemSettings::get_global(cx);
+        let close_side = &settings.close_position;
+        let always_show_close_button = settings.always_show_close_button;
         let indicator = render_item_indicator(item.boxed_clone(), cx);
         let item_id = item.item_id();
         let is_first_item = ix == 0;
@@ -2046,7 +2048,9 @@ impl Pane {
                     end_slot_action = &CloseActiveItem { save_intent: None };
                     end_slot_tooltip_text = "Close Tab";
                     IconButton::new("close tab", IconName::Close)
-                        .visible_on_hover("")
+                        .when(!always_show_close_button, |button| {
+                            button.visible_on_hover("")
+                        })
                         .shape(IconButtonShape::Square)
                         .icon_color(Color::Muted)
                         .size(ButtonSize::None)
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index bd1da9ece8..e71266a01f 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -634,7 +634,8 @@ List of `string` values
   "close_position": "right",
   "file_icons": false,
   "git_status": false,
-  "activate_on_close": "history"
+  "activate_on_close": "history",
+  "always_show_close_button": false
 },
 ```
 
@@ -698,6 +699,12 @@ List of `string` values
 }
 ```
 
+### Always show the close button
+
+- Description: Whether to always show the close button on tabs.
+- Setting: `always_show_close_button`
+- Default: `false`
+
 ## Editor Toolbar
 
 - Description: Whether or not to show various elements in the editor toolbar.