dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dock: Fix some panel cannot able to split (#450)

Browse source 
- Rename `set_root` to `set_center`.
This commit is contained in:
Jason Lee 2024-12-02 10:42:31 +08:00 committed by GitHub
parent 9d476f9517
commit 8c464d6709
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/app/src/story_workspace.rs
View file

@ -224,12 +224,7 @@ impl StoryWorkspace {
let left_panels = DockItem::split_with_sizes( let left_panels = DockItem::split_with_sizes(
Axis::Vertical, Axis::Vertical,
vec![ vec![
DockItem::tabs( DockItem::tab(StoryContainer::panel::<ListStory>(cx), &dock_area, cx),
vec![Arc::new(StoryContainer::panel::<ListStory>(cx))],
None,
&dock_area,
cx,
),
DockItem::tabs( DockItem::tabs(
vec![ vec![
Arc::new(StoryContainer::panel::<ScrollableStory>(cx)), Arc::new(StoryContainer::panel::<ScrollableStory>(cx)),
@ -263,15 +258,10 @@ impl StoryWorkspace {
let right_panels = DockItem::split_with_sizes( let right_panels = DockItem::split_with_sizes(
Axis::Vertical, Axis::Vertical,
vec![DockItem::tabs( vec![
vec![ DockItem::tab(StoryContainer::panel::<ImageStory>(cx), &dock_area, cx),
Arc::new(StoryContainer::panel::<ImageStory>(cx)), DockItem::tab(StoryContainer::panel::<IconStory>(cx), &dock_area, cx),
Arc::new(StoryContainer::panel::<IconStory>(cx)), ],
],
None,
&dock_area,
cx,
)],
vec![None], vec![None],
&dock_area, &dock_area,
cx, cx,
@ -279,7 +269,7 @@ impl StoryWorkspace {
_ = dock_area.update(cx, |view, cx| { _ = dock_area.update(cx, |view, cx| {
view.set_version(MAIN_DOCK_AREA.version, cx); view.set_version(MAIN_DOCK_AREA.version, cx);
view.set_root(dock_item, cx); view.set_center(dock_item, cx);
view.set_left_dock(left_panels, Some(px(350.)), true, cx); view.set_left_dock(left_panels, Some(px(350.)), true, cx);
view.set_bottom_dock(bottom_panels, Some(px(200.)), true, cx); view.set_bottom_dock(bottom_panels, Some(px(200.)), true, cx);
view.set_right_dock(right_panels, Some(px(320.)), true, cx); view.set_right_dock(right_panels, Some(px(320.)), true, cx);

10
crates/ui/src/dock/mod.rs
View file

@ -320,10 +320,16 @@ impl DockArea {
cx.notify(); cx.notify();
} }
/// The the DockItem as the root of the dock area. // FIXME: Remove this method after 2025-01-01
#[deprecated(note = "Use `set_center` instead")]
pub fn set_root(&mut self, item: DockItem, cx: &mut ViewContext<Self>) {
self.set_center(item, cx);
}
/// The the DockItem as the center of the dock area.
/// ///
/// This is used to render at the Center of the DockArea. /// This is used to render at the Center of the DockArea.
pub fn set_root(&mut self, item: DockItem, cx: &mut ViewContext<Self>) { pub fn set_center(&mut self, item: DockItem, cx: &mut ViewContext<Self>) {
self.subscribe_item(&item, cx); self.subscribe_item(&item, cx);
self.items = item; self.items = item;
self.update_toggle_button_tab_panels(cx); self.update_toggle_button_tab_panels(cx);

6
crates/ui/src/dock/stack_panel.rs
View file

@ -82,13 +82,17 @@ impl StackPanel {
/// Return true if self or parent only have last panel. /// Return true if self or parent only have last panel.
pub(super) fn is_last_panel(&self, cx: &AppContext) -> bool { pub(super) fn is_last_panel(&self, cx: &AppContext) -> bool {
if self.panels.len() > 1 {
return false;
}
if let Some(parent) = &self.parent { if let Some(parent) = &self.parent {
if let Some(parent) = parent.upgrade() { if let Some(parent) = parent.upgrade() {
return parent.read(cx).is_last_panel(cx); return parent.read(cx).is_last_panel(cx);
} }
} }
self.panels.len() == 1 true
} }
pub(super) fn panels_len(&self) -> usize { pub(super) fn panels_len(&self) -> usize {