diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-12-16 03:24:07 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-16 03:24:07 +0000 |
commit | 7be7952f2fb1d34963a041fc9bc4d4841d8de74a (patch) | |
tree | d6417d999b1f4a7a38290eb94004934fe57d1163 /pango/pangoft2.c | |
parent | da045342eccab09d3d6be33b1b65ebeb5dc2b2f0 (diff) | |
download | pango-7be7952f2fb1d34963a041fc9bc4d4841d8de74a.tar.gz |
Add pixel sizes for fonts (#119081, patch from Chris Lahey)
Wed Dec 15 22:09:42 2004 Owen Taylor <otaylor@redhat.com>
Add pixel sizes for fonts (#119081, patch from Chris Lahey)
* pango/fonts.c pango/pango-font.h:
Add pango_font_description_set_absolute_size(),
pango_font_description_get_size_is_absolute()
* pango/pango-attributes.[ch]: Add pango_attr_size_new_absolute(),
change PANGO_ATTR_SIZE from PangoAttrInt to PangoAttrSize
(preserves compat because first component is identical)
* pango/pangowin32-fontmap.c (pango_win32_font_map_load_font):
For absolute sizes, convert pixels to points, before
calling pango_win32_font_new().
* pango/pangofc-fontmap.c pango/pangoft2.c pango/pangoxft-font.c:
Handle absolute sizes.
Diffstat (limited to 'pango/pangoft2.c')
-rw-r--r-- | pango/pangoft2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 268b01dc..d0c35358 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -100,8 +100,8 @@ load_fallback_face (PangoFT2Font *ft2font, int id; sans = FcPatternBuild (NULL, - FC_FAMILY, FcTypeString, "sans", - FC_SIZE, FcTypeDouble, (double)pango_font_description_get_size (fcfont->description)/PANGO_SCALE, + FC_FAMILY, FcTypeString, "sans", + FC_PIXEL_SIZE, FcTypeDouble, (double)ft2font->size / PANGO_SCALE, NULL); matched = FcFontMatch (NULL, sans, &result); |