Render editor fold indicators using Disclosures (#13008)

This PR updates the spots where we render the fold indicators in editors
to use the `Disclosure` component instead of re-implementing similar UI.

This makes this UI more consistent across Zed.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-06-13 16:05:47 -04:00 committed by GitHub
parent af8e7af265
commit 1a40e98413
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 35 additions and 32 deletions

View file

@ -54,8 +54,8 @@ use std::{
}; };
use telemetry_events::AssistantKind; use telemetry_events::AssistantKind;
use ui::{ use ui::{
popover_menu, prelude::*, ButtonLike, ContextMenu, ElevationIndex, KeyBinding, ListItem, popover_menu, prelude::*, ButtonLike, ContextMenu, Disclosure, ElevationIndex, KeyBinding,
ListItemSpacing, PopoverMenuHandle, Tab, TabBar, Tooltip, ListItem, ListItemSpacing, PopoverMenuHandle, Tab, TabBar, Tooltip,
}; };
use util::{paths::CONTEXTS_DIR, post_inc, ResultExt, TryFutureExt}; use util::{paths::CONTEXTS_DIR, post_inc, ResultExt, TryFutureExt};
use uuid::Uuid; use uuid::Uuid;
@ -3132,17 +3132,10 @@ fn render_slash_command_output_toggle(
fold: ToggleFold, fold: ToggleFold,
_cx: &mut WindowContext, _cx: &mut WindowContext,
) -> AnyElement { ) -> AnyElement {
IconButton::new( Disclosure::new(("slash-command-output-fold-indicator", row.0), !is_folded)
("slash-command-output-fold-indicator", row.0), .selected(is_folded)
ui::IconName::ChevronDown, .on_click(move |_e, cx| fold(!is_folded, cx))
) .into_any_element()
.on_click(move |_e, cx| fold(!is_folded, cx))
.icon_color(ui::Color::Muted)
.icon_size(ui::IconSize::Small)
.selected(is_folded)
.selected_icon(ui::IconName::ChevronRight)
.size(ui::ButtonSize::None)
.into_any_element()
} }
fn render_pending_slash_command_gutter_decoration( fn render_pending_slash_command_gutter_decoration(

View file

@ -138,8 +138,8 @@ use theme::{
ThemeColors, ThemeSettings, ThemeColors, ThemeSettings,
}; };
use ui::{ use ui::{
h_flex, prelude::*, ButtonSize, ButtonStyle, IconButton, IconName, IconSize, ListItem, Popover, h_flex, prelude::*, ButtonSize, ButtonStyle, Disclosure, IconButton, IconName, IconSize,
Tooltip, ListItem, Popover, Tooltip,
}; };
use util::{defer, maybe, post_inc, RangeExt, ResultExt, TryFutureExt}; use util::{defer, maybe, post_inc, RangeExt, ResultExt, TryFutureExt};
use workspace::item::{ItemHandle, PreviewTabsSettings}; use workspace::item::{ItemHandle, PreviewTabsSettings};
@ -11752,23 +11752,16 @@ impl EditorSnapshot {
|| (self.starts_indent(buffer_row) && (row_contains_cursor || self.gutter_hovered)) || (self.starts_indent(buffer_row) && (row_contains_cursor || self.gutter_hovered))
{ {
Some( Some(
IconButton::new( Disclosure::new(("indent-fold-indicator", buffer_row.0), !folded)
("indent-fold-indicator", buffer_row.0), .selected(folded)
ui::IconName::ChevronDown, .on_click(cx.listener_for(&editor, move |this, _e, cx| {
) if folded {
.on_click(cx.listener_for(&editor, move |this, _e, cx| { this.unfold_at(&UnfoldAt { buffer_row }, cx);
if folded { } else {
this.unfold_at(&UnfoldAt { buffer_row }, cx); this.fold_at(&FoldAt { buffer_row }, cx);
} else { }
this.fold_at(&FoldAt { buffer_row }, cx); }))
} .into_any_element(),
}))
.icon_color(ui::Color::Muted)
.icon_size(ui::IconSize::Small)
.selected(folded)
.selected_icon(ui::IconName::ChevronRight)
.size(ui::ButtonSize::None)
.into_any_element(),
) )
} else { } else {
None None

View file

@ -8,6 +8,7 @@ use crate::{prelude::*, Color, IconButton, IconButtonShape, IconName, IconSize};
pub struct Disclosure { pub struct Disclosure {
id: ElementId, id: ElementId,
is_open: bool, is_open: bool,
selected: bool,
on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>, on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
} }
@ -16,6 +17,7 @@ impl Disclosure {
Self { Self {
id: id.into(), id: id.into(),
is_open, is_open,
selected: false,
on_toggle: None, on_toggle: None,
} }
} }
@ -29,6 +31,20 @@ impl Disclosure {
} }
} }
impl Selectable for Disclosure {
fn selected(mut self, selected: bool) -> Self {
self.selected = selected;
self
}
}
impl Clickable for Disclosure {
fn on_click(mut self, handler: impl Fn(&ClickEvent, &mut WindowContext) + 'static) -> Self {
self.on_toggle = Some(Arc::new(handler));
self
}
}
impl RenderOnce for Disclosure { impl RenderOnce for Disclosure {
fn render(self, _cx: &mut WindowContext) -> impl IntoElement { fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
IconButton::new( IconButton::new(
@ -41,6 +57,7 @@ impl RenderOnce for Disclosure {
.shape(IconButtonShape::Square) .shape(IconButtonShape::Square)
.icon_color(Color::Muted) .icon_color(Color::Muted)
.icon_size(IconSize::Small) .icon_size(IconSize::Small)
.selected(self.selected)
.when_some(self.on_toggle, move |this, on_toggle| { .when_some(self.on_toggle, move |this, on_toggle| {
this.on_click(move |event, cx| on_toggle(event, cx)) this.on_click(move |event, cx| on_toggle(event, cx))
}) })