Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Decide which panel should be active for a dock based on ordering panels (#22346)

Browse source 
This means that `workspace::ToggleRightDock` will open the assistant if
no right-dock panel has been manually activated, instead of the chat as
before. Also cleans up the `active_panel_index` logic a bit.

cc @nathansobo 

Release Notes:

- Make `workspace::ToggleRightDock` open the assistant panel if no
right-dock panel has yet been activated
This commit is contained in:
Cole Miller 2024-12-30 09:43:17 -05:00 • committed by GitHub
parent ad51df7644
commit dcbff982ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 109 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/workspace/src/workspace.rs
View file

@ -2297,6 +2297,10 @@ impl Workspace {
let was_visible = dock.is_open() && !other_is_zoomed;
dock.set_open(!was_visible, cx);
if dock.active_panel().is_none() && dock.panels_len() > 0 {
dock.activate_panel(0, cx);
}
if let Some(active_panel) = dock.active_panel() {
if was_visible {
if active_panel.focus_handle(cx).contains_focused(cx) {
@ -7267,14 +7271,10 @@ mod tests {
let (panel_1, panel_2) = workspace.update(cx, |workspace, cx| {
let panel_1 = cx.new_view(|cx| TestPanel::new(DockPosition::Left, cx));
workspace.add_panel(panel_1.clone(), cx);
workspace
.left_dock()
.update(cx, |left_dock, cx| left_dock.set_open(true, cx));
workspace.toggle_dock(DockPosition::Left, cx);
let panel_2 = cx.new_view(|cx| TestPanel::new(DockPosition::Right, cx));
workspace.add_panel(panel_2.clone(), cx);
workspace
.right_dock()
.update(cx, |right_dock, cx| right_dock.set_open(true, cx));
workspace.toggle_dock(DockPosition::Right, cx);
let left_dock = workspace.left_dock();
assert_eq!(