Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2015-03-01 16:50:49 +01:00
commit 0876bd621f

View File

@ -126,7 +126,7 @@ static void draw_text_pango(const char *text, size_t text_len,
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);
pango_cairo_update_layout(cr, layout); pango_cairo_update_layout(cr, layout);
pango_layout_get_pixel_size(layout, NULL, &height); pango_layout_get_pixel_size(layout, NULL, &height);
cairo_move_to(cr, x, y - (height - savedFont->height)); cairo_move_to(cr, x, y - 0.5 * (height - savedFont->height));
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
/* Free resources */ /* Free resources */