Commit 37db78c4 authored by Alan Third's avatar Alan Third
Browse files

Fix stretch glyphs overlap with line above (bug#36633)

* src/nsterm.m (ns_dumpglyphs_stretch): Move overwriting of the
clipping rectangle to after performing clipping.
parent c26469da
Pipeline #2616 failed with stage
in 56 minutes and 56 seconds
......@@ -3913,10 +3913,13 @@ Function modeled after x_draw_glyph_string_box ().
if (!s->background_filled_p)
{
n = ns_get_glyph_string_clip_rect (s, r);
*r = NSMakeRect (s->x, s->y, s->background_width, s->height);
if (ns_clip_to_rect (s->f, r, n))
{
/* FIXME: Why are we reusing the clipping rectangles? The
other terms don't appear to do anything like this. */
*r = NSMakeRect (s->x, s->y, s->background_width, s->height);
if (s->hl == DRAW_MOUSE_FACE)
{
face = FACE_FROM_ID_OR_NULL (s->f,
......@@ -3951,13 +3954,6 @@ Function modeled after x_draw_glyph_string_box ().
r[i].origin.x += leftoverrun;
r[i].size.width -= leftoverrun;
}
/* XXX: Try to work between problem where a stretch glyph on
a partially-visible bottom row will clear part of the
modeline, and another where list-buffers headers and similar
rows erroneously have visible_height set to 0. Not sure
where this is coming from as other terms seem not to show. */
r[i].size.height = min (s->height, s->row->visible_height);
}
[bgCol set];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment