diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-02-25 20:06:45 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-25 20:06:45 +0000 |
| commit | abacca30f29df84d9818cd1395449eff0e4ee171 (patch) | |
| tree | 4541c04064b0b00416a76d7408d777f6b47b4963 /pango/fonts.c | |
| parent | 3c1ef3b659b2ffdb9613c8d2d330b64dc1fd0963 (diff) | |
| download | pango-abacca30f29df84d9818cd1395449eff0e4ee171.tar.gz | |
Add size to the font description structure instead of continually passing
Fri Feb 25 15:04:21 2000 Owen Taylor <otaylor@redhat.com>
* libpango/{fonts.c,pango-font.h,pango-context.[ch],pangox.c,
pango-attributes.c,examples/viewer.c: Add size to the
font description structure instead of continually passing
it around as an extra argument.
* libpango/pangox.c: Take screen resolution into account when
choosing fonts, instead of assumming point == pixel.
Diffstat (limited to 'pango/fonts.c')
| -rw-r--r-- | pango/fonts.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index a66fde54..45f1dcac 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -65,6 +65,7 @@ pango_font_description_compare (const PangoFontDescription *desc1, desc1->variant == desc2->variant && desc1->weight == desc2->weight && desc1->stretch == desc2->stretch && + desc1->size == desc2->size && g_strcasecmp (desc1->family_name, desc2->family_name)); } @@ -297,7 +298,6 @@ pango_font_map_unref (PangoFontMap *fontmap) * pango_font_map_load_font: * @fontmap: a #PangoFontMap * @desc: a #PangoFontDescription describing the font to load - * @size: the size at which to load the font (in points) * * Load the font in the fontmap that is the closest match for @desc. * @@ -305,12 +305,11 @@ pango_font_map_unref (PangoFontMap *fontmap) **/ PangoFont * pango_font_map_load_font (PangoFontMap *fontmap, - const PangoFontDescription *desc, - double size) + const PangoFontDescription *desc) { g_return_val_if_fail (fontmap != NULL, NULL); - return fontmap->klass->load_font (fontmap, desc, size); + return fontmap->klass->load_font (fontmap, desc); } /** |