From: Po Lu <luangruo@yahoo.com>
Date: Sun, 12 Dec 2021 13:44:02 +0000 (+0800)
Subject: Fix overline display when there is a box on PGTK
X-Git-Tag: emacs-29.0.90~3596
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13edadb4927c4f5bf130d602d60d29099e50a166;p=emacs.git

Fix overline display when there is a box on PGTK

* src/pgtkterm.c (pgtk_draw_glyph_string): Draw box before any
text decorations.
---

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index ed9d086273f..bd61c65edde 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -2503,6 +2503,10 @@ pgtk_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)
 	{
@@ -2617,10 +2621,6 @@ pgtk_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;