From 5bc785d81c01e00e187bd129d86f47fc89ff3b3b Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 12 Dec 2021 21:05:35 +0800 Subject: [PATCH] Fix overline display when there is a box * src/w32term.c (w32_draw_glyph_string): * src/xterm.c (x_draw_glyph_string): Draw box before any text decorations. --- src/w32term.c | 8 ++++---- src/xterm.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/w32term.c b/src/w32term.c index 5c6a9fef3aa..fdb088deda2 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2540,6 +2540,10 @@ w32_draw_glyph_string (struct glyph_string *s) if (!s->for_overlaps) { + /* Draw relief if not yet drawn. */ + if (!relief_drawn_p && s->face->box != FACE_NO_BOX) + w32_draw_glyph_string_box (s); + /* Draw underline. */ if (s->face->underline) { @@ -2683,10 +2687,6 @@ w32_draw_glyph_string (struct glyph_string *s) } } - /* Draw relief if not yet drawn. */ - if (!relief_drawn_p && s->face->box != FACE_NO_BOX) - w32_draw_glyph_string_box (s); - if (s->prev) { struct glyph_string *prev; diff --git a/src/xterm.c b/src/xterm.c index 0dc944fd819..9d60292756d 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4045,6 +4045,10 @@ x_draw_glyph_string (struct glyph_string *s) if (!s->for_overlaps) { + /* Draw relief if not yet drawn. */ + if (!relief_drawn_p && s->face->box != FACE_NO_BOX) + x_draw_glyph_string_box (s); + /* Draw underline. */ if (s->face->underline) { @@ -4200,10 +4204,6 @@ x_draw_glyph_string (struct glyph_string *s) } } - /* Draw relief if not yet drawn. */ - if (!relief_drawn_p && s->face->box != FACE_NO_BOX) - x_draw_glyph_string_box (s); - if (s->prev) { struct glyph_string *prev; -- 2.39.5