summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2010-03-17 22:56:48 +0100
committerKristian Rietveld <kris@gtk.org>2011-03-27 17:26:45 +0200
commit1782f8449de8044f00433e64063529914c7b1ebd (patch)
tree8f6e928a49d8db23ed74968365b92dbd956bf3cb
parentdbea53ebd8701686ccbca329ea00b16c14339efd (diff)
downloadpango-1782f8449de8044f00433e64063529914c7b1ebd.tar.gz
Properly propagate font size in pango_core_text_font_map_load_font
-rw-r--r--pango/pangocoretext-fontmap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index ce55a5b3..a507307a 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -833,11 +833,14 @@ pango_core_text_font_map_load_font (PangoFontMap *fontmap,
const gchar *family;
gchar *name;
gint size;
+ gboolean is_absolute;
size = pango_font_description_get_size (description);
if (size < 0)
return NULL;
+ is_absolute = pango_font_description_get_size_is_absolute (description);
+
family = pango_font_description_get_family (description);
family = family ? family : "";
name = g_utf8_casefold (family, -1);
@@ -856,7 +859,10 @@ pango_core_text_font_map_load_font (PangoFontMap *fontmap,
if (!find_best_match (font_family, description, &best_description, &best_face))
return NULL;
- pango_font_description_set_size (best_description, size);
+ if (is_absolute)
+ pango_font_description_set_absolute_size (best_description, size);
+ else
+ pango_font_description_set_size (best_description, size);
best_font = pango_core_text_font_map_lookup (ctfontmap,
context,