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

dock: Open dock if clicked on the tab of the collapsed bottom dock. (#1057)

Browse source
This commit is contained in:
Jason Lee 2025-07-14 18:49:31 +08:00 committed by GitHub
parent 1df450d3b0
commit 867b4ff3a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -587,6 +587,8 @@ impl TabPanel {
let bottom_dock_button = self.render_dock_toggle_button(DockPlacement::Bottom, window, cx); let bottom_dock_button = self.render_dock_toggle_button(DockPlacement::Bottom, window, cx);
let right_dock_button = self.render_dock_toggle_button(DockPlacement::Right, window, cx); let right_dock_button = self.render_dock_toggle_button(DockPlacement::Right, window, cx);
let is_bottom_dock = bottom_dock_button.is_some();
if self.panels.len() == 1 && panel_style == PanelStyle::Default { if self.panels.len() == 1 && panel_style == PanelStyle::Default {
let panel = self.panels.get(0).unwrap(); let panel = self.panels.get(0).unwrap();
@ -682,7 +684,7 @@ impl TabPanel {
) )
.children(self.panels.iter().enumerate().filter_map(|(ix, panel)| { .children(self.panels.iter().enumerate().filter_map(|(ix, panel)| {
let mut active = state.active_panel.as_ref() == Some(panel); let mut active = state.active_panel.as_ref() == Some(panel);
let disabled = self.collapsed; let droppable = self.collapsed;
if !panel.visible(cx) { if !panel.visible(cx) {
return None; return None;
@ -704,12 +706,22 @@ impl TabPanel {
}) })
.py_2() .py_2()
.selected(active) .selected(active)
.disabled(disabled) .on_click(cx.listener({
.when(!disabled, |this| { let is_collapsed = self.collapsed;
this.on_click(cx.listener(move |view, _, window, cx| { let dock_area = self.dock_area.clone();
move |view, _, window, cx| {
view.set_active_ix(ix, window, cx); view.set_active_ix(ix, window, cx);
}))
.when(state.draggable, |this| { // Open dock if clicked on the collapsed bottom dock
if is_bottom_dock && is_collapsed {
_ = dock_area.update(cx, |dock_area, cx| {
dock_area.toggle_dock(DockPlacement::Bottom, window, cx);
});
}
}
}))
.when(!droppable, |this| {
this.when(state.draggable, |this| {
this.on_drag( this.on_drag(
DragPanel::new(panel.clone(), view.clone()), DragPanel::new(panel.clone(), view.clone()),
|drag, _, _, cx| { |drag, _, _, cx| {