aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Third2021-09-08 17:57:50 +0100
committerEli Zaretskii2021-09-11 15:09:59 +0300
commite40f5a91eed69b5d6131671ba1699ce3ccb92f16 (patch)
treee1d9656f03bc02da6f8077a031168d0a409d12db /src
parentaa6cacd7138519aa8906c850950020d0546ae355 (diff)
downloademacs-e40f5a91eed69b5d6131671ba1699ce3ccb92f16.tar.gz
emacs-e40f5a91eed69b5d6131671ba1699ce3ccb92f16.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/w32term.c6
-rw-r--r--src/xterm.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 9ee3b1ed1f2..3eb078a66d8 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2057,11 +2057,11 @@ w32_draw_image_relief (struct glyph_string *s)
2057 && FIXNUMP (XCAR (Vtab_bar_button_margin)) 2057 && FIXNUMP (XCAR (Vtab_bar_button_margin))
2058 && FIXNUMP (XCDR (Vtab_bar_button_margin))) 2058 && FIXNUMP (XCDR (Vtab_bar_button_margin)))
2059 { 2059 {
2060 extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)); 2060 extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)) - thick;
2061 extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)); 2061 extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)) - thick;
2062 } 2062 }
2063 else if (FIXNUMP (Vtab_bar_button_margin)) 2063 else if (FIXNUMP (Vtab_bar_button_margin))
2064 extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin); 2064 extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin) - thick;
2065 } 2065 }
2066 2066
2067 if (s->face->id == TOOL_BAR_FACE_ID) 2067 if (s->face->id == TOOL_BAR_FACE_ID)
diff --git a/src/xterm.c b/src/xterm.c
index 4c1754ac80c..2c56c73068d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3235,11 +3235,11 @@ x_draw_image_relief (struct glyph_string *s)
3235 && FIXNUMP (XCAR (Vtab_bar_button_margin)) 3235 && FIXNUMP (XCAR (Vtab_bar_button_margin))
3236 && FIXNUMP (XCDR (Vtab_bar_button_margin))) 3236 && FIXNUMP (XCDR (Vtab_bar_button_margin)))
3237 { 3237 {
3238 extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)); 3238 extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin)) - thick;
3239 extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)); 3239 extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin)) - thick;
3240 } 3240 }
3241 else if (FIXNUMP (Vtab_bar_button_margin)) 3241 else if (FIXNUMP (Vtab_bar_button_margin))
3242 extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin); 3242 extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin) - thick;
3243 } 3243 }
3244 3244
3245 if (s->face->id == TOOL_BAR_FACE_ID) 3245 if (s->face->id == TOOL_BAR_FACE_ID)