circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-15 16:04:34 +00:00
Code Issues Projects Releases Wiki Activity

Do not hide the zoomed pane when swap-pane -d covers the active pane.

Browse Source
This commit is contained in:
Michael Grant
2026-10-03 22:20:57 +01:00
parent b9272d2f7b
commit 636826f3b4
2 changed files with 294 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-swap-pane.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cmd-swap-pane.c,v 1.55 2026/07/15 13:02:33 nicm Exp $ */
/* $OpenBSD: cmd-swap-pane.c,v 1.56 2026/10/02 12:23:44 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -182,9 +182,15 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
window_set_active_pane(src_w, tmp_wp, 1);
}
} else {
/*
* Keep the same pane active, unless the swap has covered it
* with a zoomed pane: activating it would hide the zoom. With
* -Z the zoom moves to the active pane afterwards instead.
*/
if (src_w->active == src_wp)
window_set_active_pane(src_w, dst_wp, 1);
if (dst_w->active == dst_wp)
if (dst_w->active == dst_wp &&
(args_has(args, 'Z') || window_pane_is_visible(src_wp)))
window_set_active_pane(dst_w, src_wp, 1);
}
if (src_w != dst_w) {