From 161dbaf1ced65dc0d89df5fb3b99fb091cf34b7a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Jul 2026 07:35:05 +0000
Subject: [PATCH] Cancel pending resizes and resize immediately when entering
 alternate screen, fixes flickering with scrollbars. GitHub issue 5351 from
 Michael Grant.

---
 screen-write.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/screen-write.c b/screen-write.c
index ebc40b484..4d4f90900 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -2962,7 +2962,13 @@ screen_write_alternateon(struct screen_write_ctx *ctx, struct grid_cell *gc,
 
 	if (wp != NULL) {
 		window_pane_clear_resizes(wp, NULL);
+		if (event_initialized(&wp->resize_timer))
+			evtimer_del(&wp->resize_timer);
 		layout_fix_panes(wp->window, NULL);
+		if (!TAILQ_EMPTY(&wp->resize_queue)) {
+			window_pane_send_resize(wp, wp->sx, wp->sy);
+			window_pane_clear_resizes(wp, NULL);
+		}
 		server_redraw_window_borders(wp->window);
 	}