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

fix(plugins): properly focus pane after tab was closed #3797

Merged
merged 2 commits into from
Nov 21, 2024
Merged

fix(plugins): properly focus pane after tab was closed #3797

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51b6089
fix(plugins): properly focus pane after tab was closed
imsnif Nov 21, 2024
37811da
style(fmt): rustfmt
imsnif Nov 21, 2024
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
20 changes: 12 additions & 8 deletions zellij-server/src/screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,15 +2090,16 @@ impl Screen {
.tabs
.iter()
.find(|(_tab_index, tab)| tab.has_pane_with_pid(&pane_id))
.map(|(tab_index, _tab)| *tab_index);
.map(|(_tab_index, tab)| tab.position);
match tab_index {
Some(tab_index) => {
self.go_to_tab(tab_index + 1, client_id)?;
self.tabs
.get_mut(&tab_index)
.with_context(err_context)?
.focus_pane_with_id(pane_id, should_float_if_hidden, client_id)
.context("failed to focus pane with id")?;
.iter_mut()
.find(|(_, t)| t.position == tab_index)
.map(|(_, t)| t.focus_pane_with_id(pane_id, should_float_if_hidden, client_id))
.with_context(err_context)
.non_fatal();
},
None => {
log::error!("Could not find pane with id: {:?}", pane_id);
Expand Down Expand Up @@ -2410,11 +2411,14 @@ impl Screen {
.tabs
.iter()
.find(|(_tab_index, tab)| tab.has_pane_with_pid(&pane_id))
.map(|(tab_index, _tab)| *tab_index);
.map(|(_tab_index, tab)| tab.position);
match tab_index {
Some(tab_index) => {
let tab = self.tabs.get_mut(&tab_index).with_context(err_context)?;
suppress_pane(tab, pane_id, new_pane_id);
if let Some(tab) =
self.tabs.iter_mut().find(|(_, t)| t.position == tab_index)
{
suppress_pane(tab.1, pane_id, new_pane_id);
}
},
None => {
log::error!("Could not find pane with id: {:?}", pane_id);
Expand Down
Loading