From f4e99ecde4cd6c57c6e317f4ba5ccbcea6affcb9 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 17 May 2023 14:19:35 -0700
Subject: [PATCH] Add never option to scrollbar settings

---
 assets/settings/default.json    | 2 ++
 crates/editor/src/element.rs    | 1 +
 crates/settings/src/settings.rs | 1 +
 3 files changed, 4 insertions(+)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 05e79ae9cc2f8902ff561e60ef5d72784999cc0b..1395edca4ab6f4339e8689e7aea48c1b5f531dc8 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -53,6 +53,8 @@
   //    "system"
   // 3. Always show the scrollbar:
   //    "always"
+  // 4. Never show the scrollbar:
+  //    "never"
   "show_scrollbars": "auto",
   // Whether the screen sharing icon is shown in the os status bar.
   "show_call_status_icon": true,
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 755c3091cbd3ce12592349a80bc87dbaf964c962..e1e38f2e245db4e4e83e49deda9df8029d6a3398 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2064,6 +2064,7 @@ impl Element<Editor> for EditorElement {
             }
             settings::ShowScrollbars::System => editor.scroll_manager.scrollbars_visible(),
             settings::ShowScrollbars::Always => true,
+            settings::ShowScrollbars::Never => false,
         };
 
         let include_root = editor
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 284d2579a5686060270447e380f0a9d31502c67c..55598845c7b1daa17f524f35b1e6aff9a3ba4053 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -76,6 +76,7 @@ pub enum ShowScrollbars {
     Auto,
     System,
     Always,
+    Never,
 }
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default)]