Fix imlib2/ttf text vertical positioning with certain fonts.
SVN revision: 38359
This commit is contained in:
parent
4f71661dfe
commit
d97d1a1d27
|
@ -46,9 +46,9 @@ EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y,
|
|||
Colormap cm)
|
||||
{
|
||||
Imlib_Image im;
|
||||
int w, h, ascent, descent;
|
||||
int w, h, ascent, descent, max_asc;
|
||||
|
||||
Efont_extents(f, text, &ascent, &descent, &w, NULL, NULL, NULL, NULL);
|
||||
Efont_extents(f, text, &ascent, &descent, &w, &max_asc, NULL, NULL, NULL);
|
||||
h = ascent + descent;
|
||||
|
||||
imlib_context_set_drawable(win);
|
||||
|
@ -57,8 +57,9 @@ EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y,
|
|||
|
||||
imlib_context_set_font(f->face);
|
||||
ImlibSetFgColorFromGC(dpy, gc, cm);
|
||||
imlib_text_draw(0, 0, text);
|
||||
imlib_text_draw(0, ascent - max_asc, text);
|
||||
imlib_render_image_on_drawable(x, y - ascent);
|
||||
|
||||
imlib_free_image();
|
||||
}
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ EFont_draw_string(EImage * im, EFont * f, int x, int y,
|
|||
imlib_context_set_image(im);
|
||||
imlib_context_set_color(r, g, b, 255);
|
||||
imlib_context_set_font(f);
|
||||
imlib_text_draw(x, y - imlib_get_font_ascent(), text);
|
||||
imlib_text_draw(x, y - imlib_get_maximum_font_ascent(), text);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
|
|
Loading…
Reference in New Issue