From 0cca695d6e75426e295e03668a4ed35ee62afe7c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 25 Oct 2021 09:22:17 +0000
Subject: Instead of setting the popup default colours in the draw callback,
 set it up in popup_display and follow the same routine as panes in the draw
 and init_ctx callbacks - use the palette if the option value is default.
 Allows application-set fg and bg to work in panes again.

---
 tty.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tty.c')

diff --git a/tty.c b/tty.c
index 809289e0..243eae56 100644
--- a/tty.c
+++ b/tty.c
@@ -1972,10 +1972,9 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
 		for (i = 0; i < OVERLAY_MAX_RANGES; i++)
 			vis += r.nx[i];
 		if (vis < gcp->data.width) {
-			tty_draw_line(tty, s, s->cx, s->cy,
-				    gcp->data.width, px, py, &ctx->defaults,
-				    ctx->palette);
-				return;
+			tty_draw_line(tty, s, s->cx, s->cy, gcp->data.width,
+			    px, py, &ctx->defaults, ctx->palette);
+			return;
 		}
 	}
 
-- 
cgit