From 35f4c8b333a047b53f0c68822841f2be9de095ef Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 2 Jun 2026 07:11:49 +0000
Subject: [PATCH] Fix border colour bug in the floating panes branch where
 inactive floating pane borders incorrectly use the active colour at
 intersections with tiled pane borders. From Michael Grant.

---
 screen-redraw.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/screen-redraw.c b/screen-redraw.c
index 4ba6d685..d0dca743 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -882,7 +882,9 @@ screen_redraw_draw_borders_style(struct screen_redraw_ctx *ctx, u_int x,
 	struct format_tree	*ft;
 	int			*flag;
 
-	if (screen_redraw_check_is(ctx, x, y, active)) {
+	if ((wp->flags & PANE_FLOATING && wp == active) ||
+	    (!(wp->flags & PANE_FLOATING) &&
+	    screen_redraw_check_is(ctx, x, y, active))) {
 		flag = &wp->active_border_gc_set;
 		gc = &wp->active_border_gc;
 		border_option = "pane-active-border-style";