[gnumeric] Ensure that ######### are printed at correct height

[Andreas J. Guelzow <guelzow src gnome org>]

commit 6188449bd9a3a27145c87941fad17c4e487628ba
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Nov 8 20:36:42 2012 -0700

    Ensure that ######### are printed at correct height
    
    2012-11-08  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/cell-draw.c (cell_draw_simplify_cb): change argument type and flag
    	possible change in layout height
    	(cell_draw_simplify_attributes): change argument type and recalc natural
    	height if necessary
    	(cell_calc_layout): adjust call of cell_draw_simplify_attributes

 ChangeLog       |    8 ++++++++
 src/cell-draw.c |   25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6ee97b7..efb3939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-11-08  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/cell-draw.c (cell_draw_simplify_cb): change argument type and flag
+	possible change in layout height
+	(cell_draw_simplify_attributes): change argument type and recalc natural
+	height if necessary
+	(cell_calc_layout): adjust call of cell_draw_simplify_attributes
+
+2012-11-08  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/cell-draw.c (cell_draw_simplify_cb): new
 	(cell_draw_simplify_attributes): new
 	(cell_calc_layout): use the above after setting hashes
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 96295ee..c76a21d 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -29,21 +29,28 @@ static char const hashes[] =
 
 static gboolean 
 cell_draw_simplify_cb (PangoAttribute *attribute,
-		       G_GNUC_UNUSED gpointer data)
+		       gboolean *recalc_height)
 {
-	return ((attribute->klass->type == PANGO_ATTR_RISE) ||
-		(attribute->klass->type == PANGO_ATTR_SCALE) ||
-		(attribute->klass->type == PANGO_ATTR_SHAPE));
+	if ((attribute->klass->type == PANGO_ATTR_RISE) ||
+	    (attribute->klass->type == PANGO_ATTR_SCALE)) {
+		*recalc_height = TRUE;
+		return TRUE;
+	} 
+	return (attribute->klass->type == PANGO_ATTR_SHAPE);
 }
 
 static void
-cell_draw_simplify_attributes (PangoLayout *layout)
+cell_draw_simplify_attributes (GnmRenderedValue *rv)
 {
 	PangoAttrList *pal = pango_attr_list_ref 
-		(pango_layout_get_attributes (layout));
+		(pango_layout_get_attributes (rv->layout));
+	gboolean recalc_height = FALSE;
 	pango_attr_list_unref 
 		(pango_attr_list_filter 
-		 (pal, (PangoAttrFilterFunc) cell_draw_simplify_cb, NULL));
+		 (pal, (PangoAttrFilterFunc) cell_draw_simplify_cb, &recalc_height));
+	if (recalc_height)
+		pango_layout_get_size (rv->layout, NULL,
+				       &rv->layout_natural_height);
 }
 
 /*
@@ -112,7 +119,7 @@ cell_calc_layout (G_GNUC_UNUSED GnmCell const *cell, GnmRenderedValue *rv, int y
 		   the characters in the number.  Probably ok.  */
 		pango_layout_set_text (layout, hashes,
 				       MIN (sizeof (hashes) - 1, 2 * textlen));
-		cell_draw_simplify_attributes (layout);
+		cell_draw_simplify_attributes (rv);
 		rv->numeric_overflow = TRUE;
 		rv->variable_width = TRUE;
 		rv->hfilled = TRUE;
@@ -121,7 +128,7 @@ cell_calc_layout (G_GNUC_UNUSED GnmCell const *cell, GnmRenderedValue *rv, int y
 	/* Special handling of error dates.  */
 	if (!was_drawn && rv->numeric_overflow) {
 		pango_layout_set_text (layout, hashes, -1);
-		cell_draw_simplify_attributes (layout);
+		cell_draw_simplify_attributes (rv);
 		rv->variable_width = TRUE;
 		rv->hfilled = TRUE;
 	}