diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-05-22 20:10:08 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-05-22 20:10:08 +0000 |
| commit | ec8d35bf511a8dcdd612850917e1e9ae9b36e1d0 (patch) | |
| tree | f53a6154f829fc6ff81f278d7176c84ce4c290af /pango/pangocairo-font.c | |
| parent | f9697a634b7267fa0743e47561c28b3ca3ae226b (diff) | |
| download | pango-ec8d35bf511a8dcdd612850917e1e9ae9b36e1d0.tar.gz | |
New function pango_font_describe_with_absolute_size().
2006-05-22 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-font.h, pango/fonts.c: New function
pango_font_describe_with_absolute_size().
* pango/pangocairo-font.c (_pango_cairo_font_get_hex_box_info):
* pango/pangocairo-win32font.c (create_metrics_for_context):
* pango/pangofc-font.c (pango_fc_font_class_init),
(pango_fc_font_describe_absolute),
(pango_fc_font_create_metrics_for_context):
* pango/pangowin32.c (pango_win32_font_class_init),
(pango_win32_font_get_metrics), (pango_win32_font_describe),
(pango_win32_font_describe_absolute): Implement and use
PangoFontClass->describe_absolute.
Diffstat (limited to 'pango/pangocairo-font.c')
| -rw-r--r-- | pango/pangocairo-font.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 878e3ba4..0e42a82f 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -184,13 +184,8 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) fontmap = pango_font_get_font_map ((PangoFont *)cfont); - desc = pango_font_describe ((PangoFont *)cfont); + desc = pango_font_describe_with_absolute_size ((PangoFont *)cfont); size = pango_font_description_get_size (desc) / (1.*PANGO_SCALE); - if (pango_font_description_get_size_is_absolute (desc)) - { - int dpi = pango_cairo_font_map_get_resolution (PANGO_CAIRO_FONT_MAP (fontmap)); - size = size * 72. / dpi; - } mini_desc = pango_font_description_new (); pango_font_description_set_family_static (mini_desc, "monospace"); @@ -201,12 +196,12 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) if (is_hinted) { mini_size = HINT_Y (mini_size); - } - if (mini_size < 5.0) - { - rows = 1; - mini_size = MIN (MAX (size - 1, 0), 5.0); + if (mini_size < 5.0) + { + rows = 1; + mini_size = MIN (MAX (size - 1, 0), 5.0); + } } pango_font_description_set_size (mini_desc, mini_size * PANGO_SCALE); |