Bug 342525 – With PangoFc and PangoWin32, approximate digit width is not

2006-05-21  Behdad Esfahbod  <behdad@gnome.org>

        Bug 342525 – With PangoFc and PangoWin32, approximate digit width is
        not what it says

        * pango/pangofc-font.c (pango_fc_font_create_metrics_for_context):
        Likewise for PangoFc.  Compute average instead of max.
        (max_glpyh_with): Now unused, drop.

2 files changed, 15 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index fc1f573e..9f38ac13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
+2006-05-21  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 342525 – With PangoFc and PangoWin32, approximate digit width is
+	not what it says
+
+	* pango/pangofc-font.c (pango_fc_font_create_metrics_for_context):
+	Likewise for PangoFc.  Compute average instead of max.
+	(max_glpyh_with): Now unused, drop.
+
 2006-05-22  Tor Lillqvist  <tml@novell.com>
 
+	Bug 342525 – With PangoFc and PangoWin32, approximate digit width is
+	not what it says
+
 	* pango/pangowin32.c (pango_win32_font_get_metrics): Calculate
 	average digit width correctly, not as max of the digit
 	widths. (#342525) Note that this code doesn't really get much used
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 2c0968d4..e31155a0 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -392,30 +392,6 @@ get_face_metrics (PangoFcFont      *fcfont,
   PANGO_FC_FONT_UNLOCK_FACE (fcfont);
 }
 
-static int
-max_glyph_width (PangoLayout *layout)
-{
-  int max_width = 0;
-  GSList *l, *r;
-
-  for (l = pango_layout_get_lines (layout); l; l = l->next)
-    {
-      PangoLayoutLine *line = l->data;
-
-      for (r = line->runs; r; r = r->next)
-        {
-          PangoGlyphString *glyphs = ((PangoGlyphItem *)r->data)->glyphs;
-          int i;
-
-          for (i = 0; i < glyphs->num_glyphs; i++)
-            if (glyphs->glyphs[i].geometry.width > max_width)
-              max_width = glyphs->glyphs[i].geometry.width;
-        }
-    }
-
-  return max_width;
-}
-
 PangoFontMetrics *
 pango_fc_font_create_metrics_for_context (PangoFcFont   *fcfont,
 					  PangoContext  *context)
@@ -435,12 +411,11 @@ pango_fc_font_create_metrics_for_context (PangoFcFont   *fcfont,
   
   pango_layout_set_text (layout, sample_str, -1);      
   pango_layout_get_extents (layout, NULL, &extents);
-  
-  metrics->approximate_char_width = 
-    extents.width / g_utf8_strlen (sample_str, -1);
+  metrics->approximate_char_width = extents.width / g_utf8_strlen (sample_str, -1);
 
   pango_layout_set_text (layout, "0123456789", -1);
-  metrics->approximate_digit_width = max_glyph_width (layout);
+  pango_layout_get_extents (layout, NULL, &extents);
+  metrics->approximate_digit_width = extents.width / 10;
 
   g_object_unref (layout);