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

dock: Fix toggle button check will stack overflow bug. (#312)

Browse source 
Continue #297 #309

```
thread 'main' has overflowed its stack
fatal runtime error: stack overflow
[1]    45068 abort      cargo run
```
This commit is contained in:
Jason Lee 2024-10-04 15:00:00 +08:00 committed by GitHub
parent 3df75566b3
commit e1e66e8f07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,25 +279,37 @@ impl StackPanel {
} }
/// Check if the given panel is at the first top left in the stack. /// Check if the given panel is at the first top left in the stack.
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>,
check_parent: bool,
cx: &AppContext,
) -> bool {
let first_panel = self.panels.first(); let first_panel = self.panels.first();
if let Some(parent) = &self.parent { if let Some(parent) = &self.parent {
return parent.read(cx).is_top_left_panel(panel, cx); if check_parent {
return parent.read(cx).is_top_left_panel(panel, true, 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();
} else if let Ok(view) = view.view().downcast::<Self>() { } else if let Ok(view) = view.view().downcast::<Self>() {
return view.read(cx).is_top_left_panel(panel, cx); return view.read(cx).is_top_left_panel(panel, false, cx);
} }
} }
false false
} }
/// Check if the given panel is at the first top right in the stack. /// Check if the given panel is at the first top right in the stack.
pub(super) fn is_top_right_panel(&self, panel: View<TabPanel>, cx: &AppContext) -> bool { pub(super) fn is_top_right_panel(
&self,
panel: View<TabPanel>,
check_parent: bool,
cx: &AppContext,
) -> bool {
let first_panel = if self.axis.is_vertical() { let first_panel = if self.axis.is_vertical() {
self.panels.first() self.panels.first()
} else { } else {
@ -305,14 +317,16 @@ impl StackPanel {
}; };
if let Some(parent) = &self.parent { if let Some(parent) = &self.parent {
return parent.read(cx).is_top_right_panel(panel, cx); if check_parent {
return parent.read(cx).is_top_right_panel(panel, true, 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();
} else if let Ok(view) = view.view().downcast::<Self>() { } else if let Ok(view) = view.view().downcast::<Self>() {
return view.read(cx).is_top_right_panel(panel, cx); return view.read(cx).is_top_right_panel(panel, false, cx);
} }
} }

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

@ -366,7 +366,10 @@ impl TabPanel {
} }
if let Some(parent) = self.stack_panel.as_ref() { if let Some(parent) = self.stack_panel.as_ref() {
if !parent.read(cx).is_top_left_panel(cx.view().clone(), cx) { if !parent
.read(cx)
.is_top_left_panel(cx.view().clone(), true, cx)
{
return None; return None;
} }
} }
@ -381,7 +384,10 @@ impl TabPanel {
} }
if let Some(parent) = self.stack_panel.as_ref() { if let Some(parent) = self.stack_panel.as_ref() {
if !parent.read(cx).is_top_right_panel(cx.view().clone(), cx) { if !parent
.read(cx)
.is_top_right_panel(cx.view().clone(), true, cx)
{
return None; return None;
} }
} }