zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-23 01:01:30 +03:00
Code Issues Projects Releases Wiki Activity

fix(layout): pane focus in stack (#2344)

Browse Source
This commit is contained in:
Aram Drevekenin 2023-04-03 18:54:37 +02:00 committed by GitHub
parent df8db1d2e7
commit 809e3d8d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zellij-server/src/panes/tiled_panes/mod.rs
View File

@ -1434,6 +1434,10 @@ impl TiledPanes {
.iter() .iter()
.map(|(cid, pid)| (*cid, *pid)) .map(|(cid, pid)| (*cid, *pid))
.collect(); .collect();
let clients_need_to_be_moved = active_panes.iter().any(|(_c_id, p_id)| *p_id == pane_id);
if !clients_need_to_be_moved {
return;
}
// find the most recently active pane // find the most recently active pane
let mut next_active_pane_candidates: Vec<(&PaneId, &Box<dyn Pane>)> = self let mut next_active_pane_candidates: Vec<(&PaneId, &Box<dyn Pane>)> = self
@ -1456,9 +1460,7 @@ impl TiledPanes {
.map(|p| p.current_geom().is_stacked) .map(|p| p.current_geom().is_stacked)
.unwrap_or(false) .unwrap_or(false)
{ {
let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) self.expand_pane_in_stack(next_active_pane_id);
.expand_pane(&next_active_pane_id);
self.reapply_pane_frames();
} }
for (client_id, active_pane_id) in active_panes { for (client_id, active_pane_id) in active_panes {
if active_pane_id == pane_id { if active_pane_id == pane_id {