[gtk+/wip/icon-helper] cellrendererpix: make sure to select the default helper as a fallback
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/icon-helper] cellrendererpix: make sure to select the default helper as a fallback
- Date: Wed, 30 Nov 2011 16:28:32 +0000 (UTC)
commit 997cd4feb52f83702014af4a73d26e4fd5981d4d
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Nov 30 11:27:24 2011 -0500
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.
gtk/gtkcellrendererpixbuf.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 52dbc6d..9d218be 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -532,18 +532,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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]