nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libi3/font: Draw the text at the expected place 

When drawing a text with Pango, shift it to the top according to the top
if the glyph if taller than expected
We always shift of (height - savedHeight) which is a no-op for normal glyphs

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2013-09-27 15:55:49 +02:00 committed by Michael Stapelberg
parent dbec5eb905
commit a49dfaf26c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libi3/font.c
View File

@ -86,16 +86,20 @@ static void draw_text_pango(const char *text, size_t text_len,
root_visual_type, x + max_width, y + savedFont->height); root_visual_type, x + max_width, y + savedFont->height);
cairo_t *cr = cairo_create(surface); cairo_t *cr = cairo_create(surface);
PangoLayout *layout = pango_cairo_create_layout(cr); PangoLayout *layout = pango_cairo_create_layout(cr);
gint height;
pango_layout_set_font_description(layout, savedFont->specific.pango_desc); pango_layout_set_font_description(layout, savedFont->specific.pango_desc);
pango_layout_set_width(layout, max_width * PANGO_SCALE); pango_layout_set_width(layout, max_width * PANGO_SCALE);
pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
pango_layout_set_text(layout, text, text_len);
/* Do the drawing */ /* Do the drawing */
cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue); cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
cairo_move_to(cr, x, y);
pango_layout_set_text(layout, text, text_len);
pango_cairo_update_layout(cr, layout); pango_cairo_update_layout(cr, layout);
pango_layout_get_pixel_size(layout, NULL, &height);
cairo_move_to(cr, x, y - (height - savedFont->height));
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
/* Free resources */ /* Free resources */