cellrendererpix: make sure to select the default helper as a fallback

If we don't have expander pixbufs, select the default helper to render
the icon, even if the cell is an expander. This mimics what the old code
did.
This commit is contained in:
Cosimo Cecchi 2011-11-30 11:27:24 -05:00
parent 0304cc04d3
commit 126651f889

View File

@ -531,18 +531,14 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
_gtk_icon_helper_set_pixbuf (icon_helper, priv->pixbuf_expander_closed);
}
}
else
{
icon_helper = g_object_ref (priv->icon_helper);
}
if (icon_helper != NULL)
{
_gtk_icon_helper_draw (icon_helper,
context, cr,
pix_rect.x, pix_rect.y);
g_object_unref (icon_helper);
}
if (icon_helper == NULL)
icon_helper = g_object_ref (priv->icon_helper);
_gtk_icon_helper_draw (icon_helper,
context, cr,
pix_rect.x, pix_rect.y);
g_object_unref (icon_helper);
gtk_style_context_restore (context);
}