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.
This commit is contained in:
Anders Carlsson 2001-07-13 06:30:15 +00:00 committed by Anders Carlsson
parent c042389acc
commit 2afa5510dc
8 changed files with 46 additions and 1 deletions

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -1,3 +1,9 @@
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):

View File

@ -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,