Load a font suitable for viewing English text when creating mini font for

2005-11-22  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pangoxft-font.c (_pango_xft_font_get_mini_font): Load a font
        suitable for viewing English text when creating mini font for hex
        boxes. (#312477)

1 files changed, 16 insertions, 16 deletions

diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 824c0bad..3ba8c457 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -269,22 +269,6 @@ pango_cairo_fc_font_get_glyph_info (PangoFont   *font,
   return info;
 }
      
-static void
-pango_cairo_fc_font_get_glyph_extents (PangoFont      *font,
-				       PangoGlyph      glyph,
-				       PangoRectangle *ink_rect,
-				       PangoRectangle *logical_rect)
-{
-  PangoCairoFcGlyphInfo *info;
-
-  info = pango_cairo_fc_font_get_glyph_info (font, glyph);
-  
-  if (ink_rect)
-    *ink_rect = info->ink_rect;
-  if (logical_rect)
-    *logical_rect = info->logical_rect;
-}
-
 /* This function is cut-and-pasted from pangocairo-fcfont.c - it might be
  * better to add a virtual fcfont->create_context (font).
  */
@@ -408,6 +392,22 @@ pango_cairo_fc_font_real_get_unknown_glyph (PangoFcFont *font,
 }
 
 static void
+pango_cairo_fc_font_get_glyph_extents (PangoFont      *font,
+				       PangoGlyph      glyph,
+				       PangoRectangle *ink_rect,
+				       PangoRectangle *logical_rect)
+{
+  PangoCairoFcGlyphInfo *info;
+
+  info = pango_cairo_fc_font_get_glyph_info (font, glyph);
+  
+  if (ink_rect)
+    *ink_rect = info->ink_rect;
+  if (logical_rect)
+    *logical_rect = info->logical_rect;
+}
+
+static void
 pango_cairo_fc_font_shutdown (PangoFcFont *fcfont)
 {
   PangoCairoFcFont *cffont = PANGO_CAIRO_FC_FONT (fcfont);