diff options
| author | Gerd Moellmann | 2000-05-02 20:02:29 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-05-02 20:02:29 +0000 |
| commit | 95af8492a3f29dc8bfaeb6cfd4fb0edb478a885a (patch) | |
| tree | effc47bdd524e3e2ff821f13efc73f095fdc90bc /src/xterm.c | |
| parent | a6ce554033c983dc8f3b90200124d189c3ca8b42 (diff) | |
| download | emacs-95af8492a3f29dc8bfaeb6cfd4fb0edb478a885a.tar.gz emacs-95af8492a3f29dc8bfaeb6cfd4fb0edb478a885a.zip | |
(x_produce_image_glyph, x_draw_image_foreground)
(x_draw_image_relief, x_draw_image_foreground_1): Call function
image_ascent instead of using IMAGE_ASCENT.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index 0bb64d881b1..2629ec943bd 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1492,7 +1492,7 @@ x_produce_image_glyph (it) | |||
| 1492 | PREPARE_FACE_FOR_DISPLAY (it->f, face); | 1492 | PREPARE_FACE_FOR_DISPLAY (it->f, face); |
| 1493 | prepare_image_for_display (it->f, img); | 1493 | prepare_image_for_display (it->f, img); |
| 1494 | 1494 | ||
| 1495 | it->ascent = it->phys_ascent = IMAGE_ASCENT (img); | 1495 | it->ascent = it->phys_ascent = image_ascent (img, face); |
| 1496 | it->descent = it->phys_descent = img->height + 2 * img->margin - it->ascent; | 1496 | it->descent = it->phys_descent = img->height + 2 * img->margin - it->ascent; |
| 1497 | it->pixel_width = img->width + 2 * img->margin; | 1497 | it->pixel_width = img->width + 2 * img->margin; |
| 1498 | 1498 | ||
| @@ -3560,7 +3560,7 @@ x_draw_image_foreground (s) | |||
| 3560 | struct glyph_string *s; | 3560 | struct glyph_string *s; |
| 3561 | { | 3561 | { |
| 3562 | int x; | 3562 | int x; |
| 3563 | int y = s->ybase - IMAGE_ASCENT (s->img); | 3563 | int y = s->ybase - image_ascent (s->img, s->face); |
| 3564 | 3564 | ||
| 3565 | /* If first glyph of S has a left box line, start drawing it to the | 3565 | /* If first glyph of S has a left box line, start drawing it to the |
| 3566 | right of that line. */ | 3566 | right of that line. */ |
| @@ -3639,7 +3639,7 @@ x_draw_image_relief (s) | |||
| 3639 | int x0, y0, x1, y1, thick, raised_p; | 3639 | int x0, y0, x1, y1, thick, raised_p; |
| 3640 | XRectangle r; | 3640 | XRectangle r; |
| 3641 | int x; | 3641 | int x; |
| 3642 | int y = s->ybase - IMAGE_ASCENT (s->img); | 3642 | int y = s->ybase - image_ascent (s->img, s->face); |
| 3643 | 3643 | ||
| 3644 | /* If first glyph of S has a left box line, start drawing it to the | 3644 | /* If first glyph of S has a left box line, start drawing it to the |
| 3645 | right of that line. */ | 3645 | right of that line. */ |
| @@ -3688,7 +3688,7 @@ x_draw_image_foreground_1 (s, pixmap) | |||
| 3688 | Pixmap pixmap; | 3688 | Pixmap pixmap; |
| 3689 | { | 3689 | { |
| 3690 | int x; | 3690 | int x; |
| 3691 | int y = s->ybase - s->y - IMAGE_ASCENT (s->img); | 3691 | int y = s->ybase - s->y - image_ascent (s->img, s->face); |
| 3692 | 3692 | ||
| 3693 | /* If first glyph of S has a left box line, start drawing it to the | 3693 | /* If first glyph of S has a left box line, start drawing it to the |
| 3694 | right of that line. */ | 3694 | right of that line. */ |