From c7dad1cb19bb406f2b4e489a53e1b4267642b336 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 17 Jun 2025 19:21:45 +0300 Subject: [PATCH] Use more conservative settings for the minimap display (#32878) Follow-up of https://github.com/zed-industries/zed/pull/31390 Release Notes: - N/A --- assets/settings/default.json | 6 +++--- crates/editor/src/editor_settings.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/settings/default.json b/assets/settings/default.json index 578cf613e5..5fb9d3c3ee 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -403,10 +403,10 @@ // Where to show the minimap in the editor. // This setting can take two values: // 1. Show the minimap on the focused editor only: - // "active_editor" + // "active_editor" (default) // 2. Show the minimap on all open editors: - // "all_editors" (default) - "display_in": "all_editors", + // "all_editors" + "display_in": "active_editor", // When to show the minimap thumb. // This setting can take two values: // 1. Show the minimap thumb if the mouse is over the minimap: diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs index 724cf5d905..68f4c2afb8 100644 --- a/crates/editor/src/editor_settings.rs +++ b/crates/editor/src/editor_settings.rs @@ -218,9 +218,9 @@ pub enum ShowMinimap { #[serde(rename_all = "snake_case")] pub enum DisplayIn { /// Show on all open editors. - #[default] AllEditors, /// Show the minimap on the active editor only. + #[default] ActiveEditor, } @@ -615,7 +615,7 @@ pub struct MinimapContent { /// Where to show the minimap in the editor. /// - /// Default: all_editors + /// Default: [`DisplayIn::ActiveEditor`] pub display_in: Option, /// When to show the minimap thumb.