[gnumeric] Fix printing of background colours. [#650261]

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

commit 21ce7f2fa8d64cb553142de7922dc3988dae465e
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Tue May 17 00:53:06 2011 -0600

    Fix printing of background colours. [#650261]
    
    2011-05-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/print-cell.c (print_cell_background_gtk): don't
    	leave a space between cells
    	(print_merged_range_gtk): don't overprint the background

 ChangeLog        |    6 ++++++
 NEWS             |    1 +
 src/print-cell.c |    6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c45aad1..e658e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/print-cell.c (print_cell_background_gtk): don't
+	leave a space between cells
+	(print_merged_range_gtk): don't overprint the background
+
 2011-05-16  Morten Welinder  <terra gnome org>
 
 	* src/sheet.c (gnm_sheet_constructed): Changed from
diff --git a/NEWS b/NEWS
index f1bb345..a29bd1d 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Andreas:
 	* Fix ODF style handling on import. [#649851]
 	* Import more validations from ODF.
 	* Export all validations to ODF.
+	* Fix printing of background colours. [#650261]
 
 Jean:
 	* Fixed critical. [#649901]
diff --git a/src/print-cell.c b/src/print-cell.c
index d08c781..14078d4 100644
--- a/src/print-cell.c
+++ b/src/print-cell.c
@@ -159,7 +159,8 @@ print_cell_background_gtk (cairo_t *context,
 		       double x, double y, double w, double h)
 {
 	if (gnumeric_background_set_gtk (style, context))
-		print_rectangle_gtk (context, x, y, w, h);
+		/* Remember api excludes the far pixels */
+		print_rectangle_gtk (context, x, y, w+0.2, h+0.2);
 	gnm_style_border_print_diag_gtk (style, context, x, y, x+w, y+h);
 }
 
@@ -213,8 +214,7 @@ print_merged_range_gtk (cairo_t *context,
 	}
 
 	if (gnumeric_background_set_gtk (style, context))
-		/* Remember api excludes the far pixels */
-		print_rectangle_gtk (context, l, t, r-l+1, b-t+1);
+		print_rectangle_gtk (context, l, t, r-l+0.2, b-t+0.2);
 
 	if (range->start.col < view->start.col)
 		l -= dir * sheet_col_get_distance_pts (sheet,