From: Gerd Moellmann Date: Tue, 30 Oct 2001 15:00:38 +0000 (+0000) Subject: (x_draw_relief_rect): Correct bottom relief by 1 pixel. X-Git-Tag: ttn-vms-21-2-B4~19005 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=327f42ee807888a049eda51daa025020e388577e;p=emacs.git (x_draw_relief_rect): Correct bottom relief by 1 pixel. (x_set_glyph_string_background_width): Set extends_to_end_of_line_p if the row's fill_line_p is set and drawing the last glyph with DRAW_IMAGE_{RAISED,SUNKEN}. --- diff --git a/src/ChangeLog b/src/ChangeLog index fa377529266..c79704d45c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2001-10-30 Gerd Moellmann + * xterm.c (x_draw_relief_rect): Correct bottom relief by 1 pixel. + (x_set_glyph_string_background_width): Set + extends_to_end_of_line_p if the row's fill_line_p is set and + drawing the last glyph with DRAW_IMAGE_{RAISED,SUNKEN}. + * xdisp.c (clear_garbaged_frames): Call Fredraw_frame. 2001-10-29 Stefan Monnier diff --git a/src/xterm.c b/src/xterm.c index bd85e68c6e4..60b46bc3d12 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3907,7 +3907,7 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, for (i = 0; i < width; ++i) XDrawLine (dpy, window, gc, left_x + i * left_p, bottom_y - i, - right_x + 2 - i * right_p, bottom_y - i); + right_x + 1 - i * right_p, bottom_y - i); /* Right. */ if (right_p) @@ -4004,7 +4004,7 @@ x_draw_glyph_string_box (s) || (s->hl == DRAW_MOUSE_FACE && (s->next == NULL || s->next->hl != s->hl))); - + x_get_glyph_string_clip_rect (s, &clip_rect); if (s->face->box == FACE_SIMPLE_BOX) @@ -4826,7 +4826,9 @@ x_set_glyph_string_background_width (s, start, last_x) || s->face->background != default_face->background || s->face->stipple != default_face->stipple || s->row->mouse_face_p)) - || s->hl == DRAW_MOUSE_FACE)) + || s->hl == DRAW_MOUSE_FACE + || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN) + && s->row->fill_line_p))) s->extends_to_end_of_line_p = 1; /* If S extends its face to the end of the line, set its