Improved hexbox position.

2007-04-18  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pangocairo-font.c (_pango_cairo_font_get_hex_box_info):
        Improved hexbox position.


svn path=/trunk/; revision=2227

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ce6ffa45..b323d5fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-18  Behdad Esfahbod  <behdad@gnome.org>
+
+	* pango/pangocairo-font.c (_pango_cairo_font_get_hex_box_info):
+	Improved hexbox position.
+
 2007-04-12  Behdad Esfahbod  <behdad@gnome.org>
 
 	* pango/pango-ot-buffer.c (apply_gpos_ltr), (apply_gpos_rtl),
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 68130e28..d779b983 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -280,9 +280,13 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont)
 
   hbi->box_height = 3 * hbi->pad_y + rows * (hbi->pad_y + hbi->digit_height);
 
-  if (rows == 1)
+  if (rows == 1 || hbi->box_height <= font_extents.ascent)
     {
-      hbi->box_descent = hbi->pad_y;
+      hbi->box_descent = 2 * hbi->pad_y;
+    }
+  else if (hbi->box_height <= font_extents.ascent + font_extents.descent - 2 * hbi->pad_y)
+    {
+      hbi->box_descent = 2 * hbi->pad_y + hbi->box_height - font_extents.ascent;
     }
   else
     {