Take into account the xpad and ypad when calculating the width and the

2001-07-13  Anders Carlsson  <andersca@codefactory.se>

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
	into account the xpad and ypad when calculating the width and the
	height of the pixbuf cell.

ChangeLog

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-0

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-10

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-2

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-4

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-6

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

ChangeLog.pre-2-8

+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+	into account the xpad and ypad when calculating the width and the
+	height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

gtk/gtkcellrendererpixbuf.c

@@ -248,9 +248,12 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
 				     &pix_rect.y,
 				     &pix_rect.width,
 				     &pix_rect.height);
+  
   pix_rect.x += cell_area->x;
   pix_rect.y += cell_area->y;
-
+  pix_rect.width -= cell->xpad * 2;
+  pix_rect.height -= cell->ypad * 2;
+  
   if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
     gdk_pixbuf_render_to_drawable_alpha (pixbuf,
                                          window,