From abacca30f29df84d9818cd1395449eff0e4ee171 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 25 Feb 2000 20:06:45 +0000 Subject: Add size to the font description structure instead of continually passing Fri Feb 25 15:04:21 2000 Owen Taylor * 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. --- pango/pango-font.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pango/pango-font.h') diff --git a/pango/pango-font.h b/pango/pango-font.h index 1c262609..d6d67d0e 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -62,13 +62,16 @@ typedef enum { PANGO_STRETCH_ULTRA_EXPANDED } PangoStretch; -struct _PangoFontDescription { - gchar *family_name; +struct _PangoFontDescription +{ + char *family_name; PangoStyle style; PangoVariant variant; PangoWeight weight; PangoStretch stretch; + + int size; }; PangoFontDescription *pango_font_description_copy (const PangoFontDescription *desc); @@ -133,8 +136,7 @@ struct _PangoFontMapClass { void (*destroy) (PangoFontMap *fontmap); PangoFont *(*load_font) (PangoFontMap *fontmap, - const PangoFontDescription *desc, - double size); + const PangoFontDescription *desc); void (*list_fonts) (PangoFontMap *fontmap, const gchar *family, PangoFontDescription ***descs, @@ -148,8 +150,7 @@ void pango_font_map_init (PangoFontMap *fontmap); void pango_font_map_ref (PangoFontMap *fontmap); void pango_font_map_unref (PangoFontMap *fontmap); PangoFont *pango_font_map_load_font (PangoFontMap *fontmap, - const PangoFontDescription *desc, - double size); + const PangoFontDescription *desc); void pango_font_map_list_fonts (PangoFontMap *fontmap, const gchar *family, -- cgit v1.2.1