Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Respect `scrollbar.show` setting in Markdown preview (#60410)
Akshit Joshi027cf0def75e
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rsindex 0a546f9cf8f..4c824b574dd 100644--- a/crates/markdown_preview/src/markdown_preview_view.rs+++ b/crates/markdown_preview/src/markdown_preview_view.rs@@ -9,7 +9,9 @@ use std::time::Duration;use anyhow::{Context as _, Result};use editor::items::open_resolved_target;use editor::scroll::Autoscroll;-use editor::{Editor, EditorEvent, MultiBufferOffset, SelectionEffects};+use editor::{+ Editor, EditorEvent, EditorSettingsScrollbarProxy, MultiBufferOffset, SelectionEffects,+};use gpui::{App, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageSource,InteractiveElement, IntoElement, IsZero, Pixels, Render, Resource, RetainAllImageCache,@@ -26,7 +28,9 @@ use settings::{SeedQuerySetting, Settings, update_settings_file};use theme::{SystemAppearance, Theme, ThemeRegistry};use theme_settings::ThemeSettings;use ui::utils::WithRemSize;-use ui::{ContextMenu, LinkPreview, WithScrollbar, prelude::*, right_click_menu};+use ui::{+ ContextMenu, LinkPreview, ScrollAxes, Scrollbars, WithScrollbar, prelude::*, right_click_menu,+};use util::{ResultExt,markdown::{source_position_from_fragment, split_local_url_fragment},@@ -1667,7 +1671,13 @@ impl Render for MarkdownPreviewView {}),),)- .vertical_scrollbar_for(&self.scroll_handle, window, cx)+ .custom_scrollbars(+ Scrollbars::for_settings::<EditorSettingsScrollbarProxy>()+ .show_along(ScrollAxes::Vertical)+ .tracked_scroll_handle(&self.scroll_handle),+ window,+ cx,+ ).when_some(hovered_url, |this, hovered_url| {this.child(div()