[gnumeric] more adjustments to cell rendering under zoom

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

commit ed733ab69e3f98082e109bd1fc8b7aaf280eaaf2
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Oct 22 22:30:48 2011 -0600

    more adjustments to cell rendering under zoom
    
    2011-10-22 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/rendered-value.c (rv_adjust_filter): use zoom rather than scale
    	(rv_adjust_attributes): delete debug spew and add argument
    	(gnm_rendered_value_new): adjust call to rv_adjust_attributes

 ChangeLog            |    6 ++++++
 src/rendered-value.c |   12 +++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ee303c..927182d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-22 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/rendered-value.c (rv_adjust_filter): use zoom rather than scale
+	(rv_adjust_attributes): delete debug spew and add argument
+	(gnm_rendered_value_new): adjust call to rv_adjust_attributes
+
+2011-10-22 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/mstyle.c (gnm_style_get_pango_attrs): adjust the pango
 	attributes for subscript/superscripts in the case of zoom
 	* src/rendered-value.c (rv_adjust_filter): new
diff --git a/src/rendered-value.c b/src/rendered-value.c
index 8ba03c2..a979e01 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -163,6 +163,7 @@ gnm_rendered_value_remeasure (GnmRenderedValue *rv)
 }
 
 typedef struct {
+	double zoom;
 	double scale;
 	int rise;
 } rv_adjust_attributes_t;
@@ -176,18 +177,15 @@ rv_adjust_filter (PangoAttribute *attribute, rv_adjust_attributes_t *raat)
 	}
 	if (attribute->klass->type == PANGO_ATTR_SCALE && raat->scale != 1.) {
 		PangoAttrFloat *pa_scale = (PangoAttrFloat *)attribute;
-		pa_scale->value = pa_scale->value * raat->scale;
+		pa_scale->value = pa_scale->value * raat->zoom;
 	}
 	return FALSE;
 }
 
 static void
-rv_adjust_attributes (PangoAttrList *markup, double scale, int rise)
+rv_adjust_attributes (PangoAttrList *markup, double zoom, double scale, int rise)
 {
-	rv_adjust_attributes_t raat = {scale, rise};
-
-	g_print ("rv_adjust_attributes pal:%p scale:%f rise:%d\n",
-		 markup, scale, rise);
+	rv_adjust_attributes_t raat = {zoom, scale, rise};
 
 	pango_attr_list_filter (markup, (PangoAttrFilterFunc) rv_adjust_filter,
 				&raat);
@@ -345,7 +343,7 @@ gnm_rendered_value_new (GnmCell const *cell,
 			if (tscale != 1|| rise != 0) {
 				markup = c_markup = pango_attr_list_copy 
 					((PangoAttrList *)markup);
-				rv_adjust_attributes (c_markup, tscale, rise);
+				rv_adjust_attributes (c_markup, zoom, tscale, rise);
 			}
 
 			pango_attr_list_splice (attrs, (PangoAttrList *)markup, 0, 0);