procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix display of stretch glyphs

Browse source 
* src/xterm.c (x_draw_stretch_glyph_string):
* src/w32term.c (w32_draw_stretch_glyph_string): Fix drawing
stretch glyphs when the window is hscrolled.  (The original
pre-Jan-2021 code was almost correct, except that it used
'window_box_left_offset' instead of 'window_box_left', and didn't
restrict the background_width fixup to text-area.)  (Bug#50564)
This commit is contained in:
Eli Zaretskii 2021-09-17 17:07:32 +03:00
parent 12d2fb58c4
commit 6397faaaf9
2 changed files with 10 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/w32term.c
View file

@ -2423,29 +2423,15 @@ w32_draw_stretch_glyph_string (struct glyph_string *s)
else if (!s->background_filled_p)
{
int background_width = s->background_width;
int x = s->x, text_left_x = window_box_left_offset (s->w, TEXT_AREA);
int x = s->x, text_left_x = window_box_left (s->w, TEXT_AREA);
/* Don't draw into left fringe or scrollbar area except for
header line and mode line. */
if (x < text_left_x && !s->row->mode_line_p)
if (s->area == TEXT_AREA
&& x < text_left_x && !s->row->mode_line_p)
{
int left_x = WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (s->w);
int right_x = text_left_x;
if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
left_x += WINDOW_LEFT_FRINGE_WIDTH (s->w);
else
right_x -= WINDOW_LEFT_FRINGE_WIDTH (s->w);
/* Adjust X and BACKGROUND_WIDTH to fit inside the space
between LEFT_X and RIGHT_X. */
if (x < left_x)
{
background_width -= left_x - x;
x = left_x;
}
if (x + background_width > right_x)
background_width = right_x - x;
background_width -= text_left_x - x;
x = text_left_x;
}
if (background_width > 0)
w32_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);

24
src/xterm.c
View file

@ -3588,29 +3588,15 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
else if (!s->background_filled_p)
{
int background_width = s->background_width;
int x = s->x, text_left_x = window_box_left_offset (s->w, TEXT_AREA);
int x = s->x, text_left_x = window_box_left (s->w, TEXT_AREA);
/* Don't draw into left fringe or scrollbar area except for
header line and mode line. */
if (x < text_left_x && !s->row->mode_line_p)
if (s->area == TEXT_AREA
&& x < text_left_x && !s->row->mode_line_p)
{
int left_x = WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (s->w);
int right_x = text_left_x;
if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
left_x += WINDOW_LEFT_FRINGE_WIDTH (s->w);
else
right_x -= WINDOW_LEFT_FRINGE_WIDTH (s->w);
/* Adjust X and BACKGROUND_WIDTH to fit inside the space
between LEFT_X and RIGHT_X. */
if (x < left_x)
{
background_width -= left_x - x;
x = left_x;
}
if (x + background_width > right_x)
background_width = right_x - x;
background_width -= text_left_x - x;
x = text_left_x;
}
if (background_width > 0)
x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);