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(screen): focus tab as well as pane when launching existing plugin #2530

Merged
merged 2 commits into from
Jun 12, 2023
Merged

fix(screen): focus tab as well as pane when launching existing plugin #2530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f9de51
fix(screen): focus tab as well as pane when launching existing plugin
imsnif Jun 12, 2023
de7db29
style(fmt): rustfmt
imsnif Jun 12, 2023
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
22 changes: 17 additions & 5 deletions zellij-server/src/screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,15 +1472,27 @@ impl Screen {
client_id: ClientId,
) -> Result<bool> {
// true => found and focused, false => not
let err_context = || format!("failed to focus_plugin_pane");
let mut tab_index_and_plugin_pane_id = None;
let all_tabs = self.get_tabs_mut();
for tab in all_tabs.values_mut() {
for (tab_index, tab) in all_tabs.iter_mut() {
if let Some(plugin_pane_id) = tab.find_plugin(&run_plugin) {
tab.focus_pane_with_id(plugin_pane_id, should_float, client_id)
.context("failed to focus plugin pane")?;
return Ok(true);
tab_index_and_plugin_pane_id = Some((*tab_index, plugin_pane_id));
break;
}
}
Ok(false)
match tab_index_and_plugin_pane_id {
Some((tab_index, plugin_pane_id)) => {
self.go_to_tab(tab_index + 1, client_id)?;
self.tabs
.get_mut(&tab_index)
.with_context(err_context)?
.focus_pane_with_id(plugin_pane_id, should_float, client_id)
.context("failed to focus plugin pane")?;
Ok(true)
},
None => Ok(false),
}
}

fn unblock_input(&self) -> Result<()> {
Expand Down