[pango] Bug 750463 - hexboxes broken for some combining characters

[Behdad Esfahbod <behdad src gnome org>]

commit dfe7ec760e08485520668ed1e2585c85545fc013
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sun Jun 7 11:08:13 2015 -0700

    Bug 750463 - hexboxes broken for some combining characters
    
    Round lsb.

 pango/pangocairo-render.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c
index f668f3b..3855fc2 100644
--- a/pango/pangocairo-render.c
+++ b/pango/pangocairo-render.c
@@ -370,12 +370,14 @@ _pango_cairo_renderer_draw_unknown_glyph (PangoCairoRenderer *crenderer,
       g_snprintf (buf, sizeof(buf), (ch > 0xffff) ? "%06X" : "%04X", ch);
     }
 
-  width = (2 * hbi->pad_x + cols * (hbi->digit_width + hbi->pad_x));
+  width = (3 * hbi->pad_x + cols * (hbi->digit_width + hbi->pad_x));
   lsb = ((double)gi->geometry.width / PANGO_SCALE - width) * .5;
+  lsb = floor (lsb / hbi->pad_x) * hbi->pad_x;
+
   _pango_cairo_renderer_draw_frame (crenderer,
-                                   cx + lsb,
+                                   cx + lsb + .5 * hbi->pad_x,
                                    cy + hbi->box_descent - hbi->box_height + hbi->pad_y * 0.5,
-                                   width,
+                                   width - hbi->pad_x,
                                    (hbi->box_height - hbi->pad_y),
                                    hbi->line_width,
                                    invalid_input);
@@ -383,7 +385,7 @@ _pango_cairo_renderer_draw_unknown_glyph (PangoCairoRenderer *crenderer,
   if (invalid_input)
     goto done;
 
-  x0 = cx + lsb + hbi->pad_x * 1.5;
+  x0 = cx + lsb + hbi->pad_x * 2;
   y0 = cy + hbi->box_descent - hbi->pad_y * 2;
 
   for (row = 0; row < rows; row++)