mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

(x_produce_image_glyph, x_draw_image_foreground)

Browse source 
(x_draw_image_relief, x_draw_image_foreground_1): Call function
image_ascent instead of using IMAGE_ASCENT.
This commit is contained in:
Gerd Moellmann 2000-05-02 20:02:29 +00:00
parent a6ce554033
commit 95af8492a3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/xterm.c
View file

@ -1492,7 +1492,7 @@ x_produce_image_glyph (it)
PREPARE_FACE_FOR_DISPLAY (it->f, face);
prepare_image_for_display (it->f, img);
it->ascent = it->phys_ascent = IMAGE_ASCENT (img);
it->ascent = it->phys_ascent = image_ascent (img, face);
it->descent = it->phys_descent = img->height + 2 * img->margin - it->ascent;
it->pixel_width = img->width + 2 * img->margin;
@ -3560,7 +3560,7 @@ x_draw_image_foreground (s)
struct glyph_string *s;
{
int x;
int y = s->ybase - IMAGE_ASCENT (s->img);
int y = s->ybase - image_ascent (s->img, s->face);
/* If first glyph of S has a left box line, start drawing it to the
right of that line. */
@ -3639,7 +3639,7 @@ x_draw_image_relief (s)
int x0, y0, x1, y1, thick, raised_p;
XRectangle r;
int x;
int y = s->ybase - IMAGE_ASCENT (s->img);
int y = s->ybase - image_ascent (s->img, s->face);
/* If first glyph of S has a left box line, start drawing it to the
right of that line. */
@ -3688,7 +3688,7 @@ x_draw_image_foreground_1 (s, pixmap)
Pixmap pixmap;
{
int x;
int y = s->ybase - s->y - IMAGE_ASCENT (s->img);
int y = s->ybase - s->y - image_ascent (s->img, s->face);
/* If first glyph of S has a left box line, start drawing it to the
right of that line. */