AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cellrendererpix: make the icon render properly again

Browse Source 
pix_rect was not initialized anymore, so the gdk_rectangle_intersect()
call would always fail.
This commit is contained in:
Cosimo Cecchi 2011-06-09 22:56:56 -04:00
parent a081485269
commit 35fdce68e1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcellrendererpixbuf.c
View File

@ -748,15 +748,19 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
GdkRectangle draw_rect;
gboolean is_expander;
gint xpad, ypad;
gint x, y;
GtkStateFlags state;
gtk_cell_renderer_pixbuf_get_size (cell, widget, (GdkRectangle *) cell_area,
&x, &y, NULL, NULL);
&pix_rect.x,
&pix_rect.y,
&pix_rect.width,
&pix_rect.height);
gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
x += cell_area->x + xpad;
y += cell_area->y + ypad;
pix_rect.x += cell_area->x + xpad;
pix_rect.y += cell_area->y + ypad;
pix_rect.width -= xpad * 2;
pix_rect.height -= ypad * 2;
if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
return;
@ -807,7 +811,8 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
pixbuf = stated;
}
gtk_render_icon (context, cr, pixbuf, x, y);
gtk_render_icon (context, cr, pixbuf,
pix_rect.x, pix_rect.y);
gtk_style_context_restore (context);
g_object_unref (pixbuf);