From: Kristian Rietveld <kris@gtk.org>
Date: Wed, 17 Mar 2010 21:56:48 +0000 (+0100)
Subject: Properly propagate font size in pango_core_text_font_map_load_font
X-Git-Tag: 1.29.1~150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a98b025b603fc1605c48f0fcebcdcefe5c99d6dc;p=platform%2Fupstream%2Fpango.git

Properly propagate font size in pango_core_text_font_map_load_font
---

diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index ce55a5b..a507307 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,