Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Oct 2, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions crates/ui/src/dock/tab_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,20 +329,26 @@ impl TabPanel {
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_right_dock = false;
let mut self_is_bottom_dock = false;
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() {
self_is_left_dock = true;
}
}
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() {
self_is_right_dock = true;
}
}
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() {
self_is_bottom_dock = true;
}
Expand All @@ -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
match placement {
DockPlacement::Left => {
if !has_left_dock {
return None;
}

if self_is_left_dock || self_is_right_dock || self_is_bottom_dock {
return None;
}
Expand All @@ -362,6 +372,10 @@ impl TabPanel {
}
}
DockPlacement::Right => {
if !has_right_dock {
return None;
}

if self_is_left_dock || self_is_right_dock || self_is_bottom_dock {
return None;
}
Expand All @@ -373,6 +387,9 @@ impl TabPanel {
}
}
DockPlacement::Bottom => {
if !has_bottom_dock {
return None;
}
if !self_is_bottom_dock {
return None;
}
Expand Down
Loading