Fix display of tab-bar buttons

* src/xterm.c (x_draw_image_relief):
* src/w32term.c (w32_draw_image_relief): Fix the display of
tab-bar buttons when mouse pointer moves off the button.
(Bug#50424)

diff --git a/src/w32term.c b/src/w32term.c
index 9ee3b1ed1f2046005ff6261281bd2d5edcbab670..3eb078a66d847fa4e90646113cdbf46d407c94cb 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2057,11 +2057,11 @@ w32_draw_image_relief (struct glyph_string *s)
          && FIXNUMP (XCAR (Vtab_bar_button_margin))
          && FIXNUMP (XCDR (Vtab_bar_button_margin)))
        {
-         extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin));
-         extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin));
+         extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)) - thick;
+         extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)) - thick;
        }
       else if (FIXNUMP (Vtab_bar_button_margin))
-       extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin);
+       extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin) - thick;
     }
 
   if (s->face->id == TOOL_BAR_FACE_ID)

diff --git a/src/xterm.c b/src/xterm.c
index 4c1754ac80cfe0c32e3b2723d991e7e0ea6a00ae..2c56c73068d80fb96a9ce74f4dcfe0c77d73765b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3235,11 +3235,11 @@ x_draw_image_relief (struct glyph_string *s)
          && FIXNUMP (XCAR (Vtab_bar_button_margin))
          && FIXNUMP (XCDR (Vtab_bar_button_margin)))
        {
-         extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin));
-         extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin));
+         extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)) - thick;
+         extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)) - thick;
        }
       else if (FIXNUMP (Vtab_bar_button_margin))
-       extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin);
+       extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin) - thick;
     }
 
   if (s->face->id == TOOL_BAR_FACE_ID)