aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-03-04 20:37:50 +0800
committerPo Lu2022-03-04 20:39:31 +0800
commitf685bcb65dbb6eb49d03fb1f420e16869c0224de (patch)
tree32130f17899eaa5da4dd68eea18ec4f98939ea98 /src
parent33958bcd3d90d626090f83cabae94e615176c92c (diff)
downloademacs-f685bcb65dbb6eb49d03fb1f420e16869c0224de.tar.gz
emacs-f685bcb65dbb6eb49d03fb1f420e16869c0224de.zip
Fix some errors in stretch glyphs code on PGTK
* src/pgtkterm.c (x_draw_stretch_glyph_string): Remove unnecessary code. Reported by Eli Zaretskii <eliz@gnu.org>.
Diffstat (limited to 'src')
-rw-r--r--src/pgtkterm.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 41e2f0ded0e..abcf18e11df 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -2373,27 +2373,16 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
2373 else if (!s->background_filled_p) 2373 else if (!s->background_filled_p)
2374 { 2374 {
2375 int background_width = s->background_width; 2375 int background_width = s->background_width;
2376 int x = s->x, text_left_x = window_box_left_offset (s->w, TEXT_AREA); 2376 int x = s->x, text_left_x = window_box_left (s->w, TEXT_AREA);
2377 2377
2378 /* Don't draw into left fringe or scrollbar area except for 2378 /* Don't draw into left fringe or scrollbar area except for
2379 header line and mode line. */ 2379 header line and mode line. */
2380 if (x < text_left_x && !s->row->mode_line_p) 2380 if (s->area == TEXT_AREA
2381 && x < text_left_x && !s->row->mode_line_p)
2381 { 2382 {
2382 int background_width = s->background_width; 2383 background_width -= text_left_x - x;
2383 int x = s->x, text_left_x = window_box_left (s->w, TEXT_AREA); 2384 x = text_left_x;
2384
2385 /* Don't draw into left fringe or scrollbar area except for
2386 header line and mode line. */
2387 if (s->area == TEXT_AREA
2388 && x < text_left_x && !s->row->mode_line_p)
2389 {
2390 background_width -= text_left_x - x;
2391 x = text_left_x;
2392 }
2393 if (background_width > 0)
2394 x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);
2395 } 2385 }
2396
2397 if (background_width > 0) 2386 if (background_width > 0)
2398 x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); 2387 x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);
2399 } 2388 }