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

dock: Fix toggle dock button display when have nested panels. (#309)

Browse source
This commit is contained in:
Jason Lee 2024-10-04 14:22:24 +08:00 committed by GitHub
parent 185eca6c67
commit cf88a48bec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ impl StoryWorkspace {
vec![Arc::new(StoryContainer::panel::<ListStory>(cx))]; vec![Arc::new(StoryContainer::panel::<ListStory>(cx))];
let bottom_panels: Vec<Arc<dyn PanelView>> = vec![ let bottom_panels: Vec<Arc<dyn PanelView>> = vec![
Arc::new(StoryContainer::panel::<TextStory>(cx)), Arc::new(StoryContainer::panel::<TooltipStory>(cx)),
Arc::new(StoryContainer::panel::<IconStory>(cx)), Arc::new(StoryContainer::panel::<IconStory>(cx)),
]; ];

4
crates/story/src/icon_story.rs
View file

@ -29,10 +29,6 @@ impl super::Story for IconStory {
"Icon" "Icon"
} }
fn description() -> &'static str {
"Icon use examples"
}
fn new_view(cx: &mut WindowContext) -> View<impl gpui::FocusableView> { fn new_view(cx: &mut WindowContext) -> View<impl gpui::FocusableView> {
Self::view(cx) Self::view(cx)
} }

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

@ -282,6 +282,10 @@ impl StackPanel {
pub(super) fn is_top_left_panel(&self, panel: View<TabPanel>, cx: &AppContext) -> bool { pub(super) fn is_top_left_panel(&self, panel: View<TabPanel>, cx: &AppContext) -> bool {
let first_panel = self.panels.first(); let first_panel = self.panels.first();
if let Some(parent) = &self.parent {
return parent.read(cx).is_top_left_panel(panel, cx);
}
if let Some(view) = first_panel { if let Some(view) = first_panel {
if let Ok(view) = view.view().downcast::<TabPanel>() { if let Ok(view) = view.view().downcast::<TabPanel>() {
return view.entity_id() == panel.entity_id(); return view.entity_id() == panel.entity_id();
@ -300,6 +304,10 @@ impl StackPanel {
self.panels.last() self.panels.last()
}; };
if let Some(parent) = &self.parent {
return parent.read(cx).is_top_right_panel(panel, cx);
}
if let Some(view) = first_panel { if let Some(view) = first_panel {
if let Ok(view) = view.view().downcast::<TabPanel>() { if let Ok(view) = view.view().downcast::<TabPanel>() {
return view.entity_id() == panel.entity_id(); return view.entity_id() == panel.entity_id();