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

dock: Fix incorrect toggle button shown, when there is not have left or right dock. (#297)

Browse source
This commit is contained in:
Jason Lee 2024-10-02 23:00:26 +08:00 committed by GitHub
parent fecb2170a8
commit 494e6d15f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -329,20 +329,26 @@ impl TabPanel {
return None; return None;
} }
let mut has_left_dock = false;
let mut has_right_dock = false;
let mut has_bottom_dock = false;
let mut self_is_left_dock = false; let mut self_is_left_dock = false;
let mut self_is_right_dock = false; let mut self_is_right_dock = false;
let mut self_is_bottom_dock = false; let mut self_is_bottom_dock = false;
if let Some(left_view) = &dock_area.read(cx).left_dock { if let Some(left_view) = &dock_area.read(cx).left_dock {
has_left_dock = true;
if left_view.read(cx).panel.entity_id() == cx.view().entity_id() { if left_view.read(cx).panel.entity_id() == cx.view().entity_id() {
self_is_left_dock = true; self_is_left_dock = true;
} }
} }
if let Some(right_view) = &dock_area.read(cx).right_dock { if let Some(right_view) = &dock_area.read(cx).right_dock {
has_right_dock = true;
if right_view.read(cx).panel.entity_id() == cx.view().entity_id() { if right_view.read(cx).panel.entity_id() == cx.view().entity_id() {
self_is_right_dock = true; self_is_right_dock = true;
} }
} }
if let Some(bottom_view) = &dock_area.read(cx).bottom_dock { if let Some(bottom_view) = &dock_area.read(cx).bottom_dock {
has_bottom_dock = true;
if bottom_view.read(cx).panel.entity_id() == cx.view().entity_id() { if bottom_view.read(cx).panel.entity_id() == cx.view().entity_id() {
self_is_bottom_dock = true; self_is_bottom_dock = true;
} }
@ -351,6 +357,10 @@ impl TabPanel {
// Check the dock origin vs self.bounds.origin, if they are in the same line, then render the ToggleButton // Check the dock origin vs self.bounds.origin, if they are in the same line, then render the ToggleButton
match placement { match placement {
DockPlacement::Left => { DockPlacement::Left => {
if !has_left_dock {
return None;
}
if self_is_left_dock || self_is_right_dock || self_is_bottom_dock { if self_is_left_dock || self_is_right_dock || self_is_bottom_dock {
return None; return None;
} }
@ -362,6 +372,10 @@ impl TabPanel {
} }
} }
DockPlacement::Right => { DockPlacement::Right => {
if !has_right_dock {
return None;
}
if self_is_left_dock || self_is_right_dock || self_is_bottom_dock { if self_is_left_dock || self_is_right_dock || self_is_bottom_dock {
return None; return None;
} }
@ -373,6 +387,9 @@ impl TabPanel {
} }
} }
DockPlacement::Bottom => { DockPlacement::Bottom => {
if !has_bottom_dock {
return None;
}
if !self_is_bottom_dock { if !self_is_bottom_dock {
return None; return None;
} }