diff options
| author | Alex Larsson <alexl@redhat.com> | 2001-11-27 19:19:53 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-11-27 19:19:53 +0000 |
| commit | 02d26fc118ad513f66cf9e9ebf6de1ec3ce548ba (patch) | |
| tree | f9186285c6544c351c6b0b11aa8ab9768ab5038a /pango/pangoxft-fontmap.c | |
| parent | e369baa4f65aaceb31d8aeaf322e5d1fe0869311 (diff) | |
| download | pango-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/pangoxft-fontmap.c')
| -rw-r--r-- | pango/pangoxft-fontmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index eef3ce77..53dbaec1 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -725,11 +725,12 @@ _pango_xft_font_map_get_info (PangoFontMap *fontmap, */ PangoFontDescription * -_pango_xft_font_desc_from_pattern (XftPattern *pattern) +_pango_xft_font_desc_from_pattern (XftPattern *pattern, gboolean include_size) { PangoFontDescription *desc; PangoStyle style; PangoWeight weight; + double size; char *s; int i; @@ -772,6 +773,9 @@ _pango_xft_font_desc_from_pattern (XftPattern *pattern) else weight = PANGO_WEIGHT_NORMAL; + if (include_size && XftPatternGetDouble (pattern, XFT_SIZE, 0, &size) == XftResultMatch) + pango_font_description_set_size (desc, size * PANGO_SCALE); + pango_font_description_set_weight (desc, weight); pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL); @@ -802,7 +806,7 @@ pango_xft_face_describe (PangoFontFace *face) result_pattern = XftFontMatch (xfontmap->display, xfontmap->screen, match_pattern, &res); if (result_pattern) { - desc = _pango_xft_font_desc_from_pattern (result_pattern); + desc = _pango_xft_font_desc_from_pattern (result_pattern, FALSE); XftPatternDestroy (result_pattern); } |