Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework Toggle into Toggleable and ToggleState

Browse source
This commit is contained in:
Marshall Bowers 2023-11-29 14:33:52 -05:00
parent 6f5cc0af94
commit e77846d2dc
10 changed files with 95 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/collab_ui2/src/collab_panel.rs
View file

@ -178,7 +178,7 @@ use serde_derive::{Deserialize, Serialize};
use settings::{Settings, SettingsStore};
use ui::{
h_stack, v_stack, Avatar, Button, Color, Icon, IconButton, IconElement, Label, List,
ListHeader, ListItem, Toggle, Tooltip,
ListHeader, ListItem, Toggleable, Tooltip,
};
use util::{maybe, ResultExt, TryFutureExt};
use workspace::{
@ -2534,9 +2534,10 @@ impl CollabPanel {
.when_some(button, |el, button| el.right_button(button))
.selected(is_selected)
.when(can_collapse, |el| {
el.toggle(ui::Toggle::Toggled(is_collapsed)).on_toggle(
cx.listener(move |this, _, cx| this.toggle_section_expanded(section, cx)),
)
el.toggle(Toggleable::Toggleable(is_collapsed.into()))
.on_toggle(
cx.listener(move |this, _, cx| this.toggle_section_expanded(section, cx)),
)
})
}
@ -2853,9 +2854,9 @@ impl CollabPanel {
),
)
.toggle(if has_children {
Toggle::Toggled(disclosed)
Toggleable::Toggleable(disclosed.into())
} else {
Toggle::NotToggleable
Toggleable::NotToggleable
})
.on_toggle(
cx.listener(move |this, _, cx| this.toggle_channel_collapsed(channel_id, cx)),