if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) !=
FcResultTypeMismatch) {
- /* TODO: is PANGO_SCALE correct ?? */
- pango_font_description_set_size(out->pango_font_description,
+ pango_font_description_set_absolute_size(out->pango_font_description,
tmp_int*PANGO_SCALE);
}
void RrFontClose(RrFont *f)
{
if (f) {
+#ifdef USE_PANGO
+ pango_font_description_free(f->pango_font_description);
+#endif
XftFontClose(RrDisplay(f->inst), f->xftfont);
g_free(f);
}
-#ifdef USE_PANGO
- pango_font_description_free(f->pango_font_description);
-#endif
}
static void font_measure_full(const RrFont *f, const gchar *str,
t->font->xftfont->ascent + y,
(FcChar8*)text->str, l);
#else /* USE_PANGO */
- /* layout_line() bases y on the baseline, while
- * layout() bases y on the top of the ink layout.
- * We want the baseline to always be in the same place, thusly, we use
- * layout_line()
- * The actual line doesn't need to be freed */
+ /* layout_line() bases y on the baseline, while layout() bases y on the
+ * top of the ink layout. We want the baseline to always be in the same
+ * place, thusly, we use layout_line()
+ * The actual line doesn't need to be freed (per the pango docs) */
pango_xft_render_layout_line(d, &c, pango_layout_get_line(pl, 0),
x * PANGO_SCALE, y * PANGO_SCALE);
g_object_unref(pl);