summaryrefslogtreecommitdiff
path: root/pango/pangoft2.c
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2001-11-27 19:19:53 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-11-27 19:19:53 +0000
commit02d26fc118ad513f66cf9e9ebf6de1ec3ce548ba (patch)
treef9186285c6544c351c6b0b11aa8ab9768ab5038a /pango/pangoft2.c
parente369baa4f65aaceb31d8aeaf322e5d1fe0869311 (diff)
downloadpango-02d26fc118ad513f66cf9e9ebf6de1ec3ce548ba.tar.gz
pango/pangoft2-private.h Take extra parameter include_size that determines
2001-11-27 Alex Larsson <alexl@redhat.com> * pango/pangoft2-private.h * pango/pangoft2-fontmap.c (_pango_ft2_font_desc_from_pattern): Take extra parameter include_size that determines if the descriptor includes the size. * pango/pangoft2.c (_pango_ft2_font_new): Include size in ft2font->description. * pango/pangoxft-private.h * pango/pangoxft-fontmap.c (_pango_xft_font_desc_from_pattern): Take extra parameter include_size that determines if the descriptor includes the size. * pango/pangoxft-font.c: Include size in xfont->description.
Diffstat (limited to 'pango/pangoft2.c')
-rw-r--r--pango/pangoft2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 9823c61f..a5b83ba1 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -97,7 +97,7 @@ _pango_ft2_font_new (PangoFontMap *fontmap,
ft2font->font_pattern = pattern;
g_object_ref (G_OBJECT (fontmap));
- ft2font->description = _pango_ft2_font_desc_from_pattern (pattern);
+ ft2font->description = _pango_ft2_font_desc_from_pattern (pattern, TRUE);
ft2font->face = NULL;
if (MiniXftPatternGetDouble (pattern, XFT_PIXEL_SIZE, 0, &d) == MiniXftResultMatch)
@@ -573,7 +573,6 @@ pango_ft2_font_describe (PangoFont *font)
ft2font = PANGO_FT2_FONT (font);
desc = pango_font_description_copy (ft2font->description);
- pango_font_description_set_size (desc, ft2font->size);
return desc;
}