X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=b715bb80b076e4da150dbde4e4f99c3957b02ada;hb=be8bc711b2dd61e3171058135e18d1baa39be640;hp=f46bb660cdb2b7aded0da3be6c9589dda71598dc;hpb=efcb68de1d1bd5e776d2b9feb5e49d268b0450d8;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index f46bb660..b715bb80 100644 --- a/render/font.c +++ b/render/font.c @@ -129,8 +129,7 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring) 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); } @@ -204,12 +203,12 @@ RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring) 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,