From d2f73c17d5e017d54fb107f9ae2ed9004c08afd3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 22 Apr 2025 12:36:03 +0000
Subject: [PATCH] Add calls to layout_fix_panes after a pane swap to fix case
 if one of the panes is in alternate screen mode and had a scrollbar. From
 Michael Grant in GitHub issue 4481.

---
 cmd-swap-pane.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 4680f598..7271e50e 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -132,9 +132,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 		window_pane_stack_remove(&dst_w->last_panes, dst_wp);
 		colour_palette_from_option(&src_wp->palette, src_wp->options);
 		colour_palette_from_option(&dst_wp->palette, dst_wp->options);
+		layout_fix_panes(src_w, NULL);
+		server_redraw_window(src_w);
 	}
-	server_redraw_window(src_w);
+	layout_fix_panes(dst_w, NULL);
 	server_redraw_window(dst_w);
+
 	notify_window("window-layout-changed", src_w);
 	if (src_w != dst_w)
 		notify_window("window-layout-changed", dst_w);