X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellrendererpixbuf.c;h=90fc9fece085141ccd7fb28a987963d1fd066844;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=26bf3a1c40d3772761e168c12becb49d965d403b;hpb=b2676e9229f1cd086cff224eeaa0b4707e12470f;p=~andy%2Fgtk
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 26bf3a1c4..90fc9fece 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -12,14 +12,39 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
+#include "config.h"
#include
#include "gtkcellrendererpixbuf.h"
+#include "gtkiconfactory.h"
+#include "gtkiconhelperprivate.h"
+#include "gtkicontheme.h"
#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "a11y/gtkimagecellaccessible.h"
+
+
+/**
+ * SECTION:gtkcellrendererpixbuf
+ * @Short_description: Renders a pixbuf in a cell
+ * @Title: GtkCellRendererPixbuf
+ *
+ * A #GtkCellRendererPixbuf can be used to render an image in a cell. It allows
+ * to render either a given #GdkPixbuf (set via the
+ * #GtkCellRendererPixbuf:pixbuf property) or a stock icon (set via the
+ * #GtkCellRendererPixbuf:stock-id property).
+ *
+ * To support the tree view, #GtkCellRendererPixbuf also supports rendering two
+ * alternative pixbufs, when the #GtkCellRenderer:is-expander property is %TRUE.
+ * If the #GtkCellRenderer:is-expanded property is %TRUE and the
+ * #GtkCellRendererPixbuf:pixbuf-expander-open property is set to a pixbuf, it
+ * renders that pixbuf, if the #GtkCellRenderer:is-expanded property is %FALSE
+ * and the #GtkCellRendererPixbuf:pixbuf-expander-closed property is set to a
+ * pixbuf, it renders that one.
+ */
+
static void gtk_cell_renderer_pixbuf_get_property (GObject *object,
guint param_id,
@@ -29,101 +54,204 @@ static void gtk_cell_renderer_pixbuf_set_property (GObject *
guint param_id,
const GValue *value,
GParamSpec *pspec);
-static void gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *celltext);
-static void gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class);
static void gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
- GdkRectangle *rectangle,
+ const GdkRectangle *rectangle,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
static void gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- guint flags);
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags);
enum {
- PROP_ZERO,
- PROP_PIXBUF,
- PROP_PIXBUF_EXPANDER_OPEN,
- PROP_PIXBUF_EXPANDER_CLOSED
+ PROP_0,
+ PROP_PIXBUF,
+ PROP_PIXBUF_EXPANDER_OPEN,
+ PROP_PIXBUF_EXPANDER_CLOSED,
+ PROP_STOCK_ID,
+ PROP_STOCK_SIZE,
+ PROP_STOCK_DETAIL,
+ PROP_FOLLOW_STATE,
+ PROP_ICON_NAME,
+ PROP_GICON
};
-GtkType
-gtk_cell_renderer_pixbuf_get_type (void)
+struct _GtkCellRendererPixbufPrivate
{
- static GtkType cell_pixbuf_type = 0;
+ GtkIconHelper *icon_helper;
+ GtkIconSize icon_size;
- if (!cell_pixbuf_type)
- {
- static const GTypeInfo cell_pixbuf_info =
- {
- sizeof (GtkCellRendererPixbufClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_cell_renderer_pixbuf_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkCellRendererPixbuf),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_cell_renderer_pixbuf_init,
- };
-
- cell_pixbuf_type = g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererPixbuf", &cell_pixbuf_info, 0);
- }
+ GdkPixbuf *pixbuf_expander_open;
+ GdkPixbuf *pixbuf_expander_closed;
+
+ gboolean follow_state;
+
+ gchar *stock_detail;
+};
+
+
+G_DEFINE_TYPE (GtkCellRendererPixbuf, gtk_cell_renderer_pixbuf, GTK_TYPE_CELL_RENDERER)
- return cell_pixbuf_type;
-}
static void
gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *cellpixbuf)
{
+ GtkCellRendererPixbufPrivate *priv;
+
+ cellpixbuf->priv = G_TYPE_INSTANCE_GET_PRIVATE (cellpixbuf,
+ GTK_TYPE_CELL_RENDERER_PIXBUF,
+ GtkCellRendererPixbufPrivate);
+ priv = cellpixbuf->priv;
+ priv->icon_helper = _gtk_icon_helper_new ();
+ priv->icon_size = GTK_ICON_SIZE_MENU;
+}
+
+static void
+gtk_cell_renderer_pixbuf_finalize (GObject *object)
+{
+ GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
+ g_clear_object (&priv->icon_helper);
+
+ if (priv->pixbuf_expander_open)
+ g_object_unref (priv->pixbuf_expander_open);
+ if (priv->pixbuf_expander_closed)
+ g_object_unref (priv->pixbuf_expander_closed);
+
+ g_free (priv->stock_detail);
+
+ G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize (object);
}
static void
gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
-
- object_class->get_property = gtk_cell_renderer_pixbuf_get_property;
- object_class->set_property = gtk_cell_renderer_pixbuf_set_property;
-
- cell_class->get_size = gtk_cell_renderer_pixbuf_get_size;
- cell_class->render = gtk_cell_renderer_pixbuf_render;
-
- g_object_class_install_property (object_class,
- PROP_PIXBUF,
- g_param_spec_object ("pixbuf",
- _("Pixbuf Object"),
- _("The pixbuf to render."),
- GDK_TYPE_PIXBUF,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
-
- g_object_class_install_property (object_class,
- PROP_PIXBUF_EXPANDER_OPEN,
- g_param_spec_object ("pixbuf_expander_open",
- _("Pixbuf Expander Open"),
- _("Pixbuf for open expander."),
- GDK_TYPE_PIXBUF,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
-
- g_object_class_install_property (object_class,
- PROP_PIXBUF_EXPANDER_CLOSED,
- g_param_spec_object ("pixbuf_expander_closed",
- _("Pixbuf Expander Closed"),
- _("Pixbuf for closed expander."),
- GDK_TYPE_PIXBUF,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE));
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+
+ object_class->finalize = gtk_cell_renderer_pixbuf_finalize;
+
+ object_class->get_property = gtk_cell_renderer_pixbuf_get_property;
+ object_class->set_property = gtk_cell_renderer_pixbuf_set_property;
+
+ cell_class->get_size = gtk_cell_renderer_pixbuf_get_size;
+ cell_class->render = gtk_cell_renderer_pixbuf_render;
+
+ g_object_class_install_property (object_class,
+ PROP_PIXBUF,
+ g_param_spec_object ("pixbuf",
+ P_("Pixbuf Object"),
+ P_("The pixbuf to render"),
+ GDK_TYPE_PIXBUF,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_PIXBUF_EXPANDER_OPEN,
+ g_param_spec_object ("pixbuf-expander-open",
+ P_("Pixbuf Expander Open"),
+ P_("Pixbuf for open expander"),
+ GDK_TYPE_PIXBUF,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_PIXBUF_EXPANDER_CLOSED,
+ g_param_spec_object ("pixbuf-expander-closed",
+ P_("Pixbuf Expander Closed"),
+ P_("Pixbuf for closed expander"),
+ GDK_TYPE_PIXBUF,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_ID,
+ g_param_spec_string ("stock-id",
+ P_("Stock ID"),
+ P_("The stock ID of the stock icon to render"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_SIZE,
+ g_param_spec_uint ("stock-size",
+ P_("Size"),
+ P_("The GtkIconSize value that specifies the size of the rendered icon"),
+ 0,
+ G_MAXUINT,
+ GTK_ICON_SIZE_MENU,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_DETAIL,
+ g_param_spec_string ("stock-detail",
+ P_("Detail"),
+ P_("Render detail to pass to the theme engine"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkCellRendererPixbuf:icon-name:
+ *
+ * The name of the themed icon to display.
+ * This property only has an effect if not overridden by "stock_id"
+ * or "pixbuf" properties.
+ *
+ * Since: 2.8
+ */
+ g_object_class_install_property (object_class,
+ PROP_ICON_NAME,
+ g_param_spec_string ("icon-name",
+ P_("Icon Name"),
+ P_("The name of the icon from the icon theme"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkCellRendererPixbuf:follow-state:
+ *
+ * Specifies whether the rendered pixbuf should be colorized
+ * according to the #GtkCellRendererState.
+ *
+ * Since: 2.8
+ */
+ g_object_class_install_property (object_class,
+ PROP_FOLLOW_STATE,
+ g_param_spec_boolean ("follow-state",
+ P_("Follow State"),
+ P_("Whether the rendered pixbuf should be "
+ "colorized according to the state"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkCellRendererPixbuf:gicon:
+ *
+ * The GIcon representing the icon to display.
+ * If the icon theme is changed, the image will be updated
+ * automatically.
+ *
+ * Since: 2.14
+ */
+ g_object_class_install_property (object_class,
+ PROP_GICON,
+ g_param_spec_object ("gicon",
+ P_("Icon"),
+ P_("The GIcon being displayed"),
+ G_TYPE_ICON,
+ GTK_PARAM_READWRITE));
+
+
+
+ g_type_class_add_private (object_class, sizeof (GtkCellRendererPixbufPrivate));
+
+ gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_IMAGE_CELL_ACCESSIBLE);
}
static void
@@ -133,20 +261,36 @@ gtk_cell_renderer_pixbuf_get_property (GObject *object,
GParamSpec *pspec)
{
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
switch (param_id)
{
case PROP_PIXBUF:
- g_value_set_object (value,
- cellpixbuf->pixbuf ? G_OBJECT (cellpixbuf->pixbuf) : NULL);
+ g_value_set_object (value, _gtk_icon_helper_peek_pixbuf (priv->icon_helper));
break;
case PROP_PIXBUF_EXPANDER_OPEN:
- g_value_set_object (value,
- cellpixbuf->pixbuf_expander_open ? G_OBJECT (cellpixbuf->pixbuf_expander_open) : NULL);
+ g_value_set_object (value, priv->pixbuf_expander_open);
break;
case PROP_PIXBUF_EXPANDER_CLOSED:
- g_value_set_object (value,
- cellpixbuf->pixbuf_expander_closed ? G_OBJECT (cellpixbuf->pixbuf_expander_closed) : NULL);
+ g_value_set_object (value, priv->pixbuf_expander_closed);
+ break;
+ case PROP_STOCK_ID:
+ g_value_set_string (value, _gtk_icon_helper_get_stock_id (priv->icon_helper));
+ break;
+ case PROP_STOCK_SIZE:
+ g_value_set_uint (value, priv->icon_size);
+ break;
+ case PROP_STOCK_DETAIL:
+ g_value_set_string (value, priv->stock_detail);
+ break;
+ case PROP_FOLLOW_STATE:
+ g_value_set_boolean (value, priv->follow_state);
+ break;
+ case PROP_ICON_NAME:
+ g_value_set_string (value, _gtk_icon_helper_get_icon_name (priv->icon_helper));
+ break;
+ case PROP_GICON:
+ g_value_set_object (value, _gtk_icon_helper_peek_gicon (priv->icon_helper));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -154,6 +298,33 @@ gtk_cell_renderer_pixbuf_get_property (GObject *object,
}
}
+static void
+gtk_cell_renderer_pixbuf_reset (GtkCellRendererPixbuf *cellpixbuf)
+{
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+ GtkImageType storage_type = _gtk_icon_helper_get_storage_type (priv->icon_helper);
+
+ switch (storage_type)
+ {
+ case GTK_IMAGE_PIXBUF:
+ g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
+ break;
+ case GTK_IMAGE_STOCK:
+ g_object_notify (G_OBJECT (cellpixbuf), "stock-id");
+ break;
+ case GTK_IMAGE_ICON_NAME:
+ g_object_notify (G_OBJECT (cellpixbuf), "icon-name");
+ break;
+ case GTK_IMAGE_GICON:
+ g_object_notify (G_OBJECT (cellpixbuf), "gicon");
+ break;
+ case GTK_IMAGE_EMPTY:
+ default:
+ break;
+ }
+
+ _gtk_icon_helper_clear (priv->icon_helper);
+}
static void
gtk_cell_renderer_pixbuf_set_property (GObject *object,
@@ -161,37 +332,47 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GdkPixbuf *pixbuf;
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
-
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+
switch (param_id)
{
case PROP_PIXBUF:
- pixbuf = (GdkPixbuf*) g_value_get_object (value);
- if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
- if (cellpixbuf->pixbuf)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf));
- cellpixbuf->pixbuf = pixbuf;
- g_object_notify (object, "pixbuf");
+ gtk_cell_renderer_pixbuf_reset (cellpixbuf);
+ _gtk_icon_helper_set_pixbuf (priv->icon_helper, g_value_get_object (value));
break;
case PROP_PIXBUF_EXPANDER_OPEN:
- pixbuf = (GdkPixbuf*) g_value_get_object (value);
- if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
- if (cellpixbuf->pixbuf_expander_open)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_open));
- cellpixbuf->pixbuf_expander_open = pixbuf;
- g_object_notify (object, "pixbuf_expander_open");
+ if (priv->pixbuf_expander_open)
+ g_object_unref (priv->pixbuf_expander_open);
+ priv->pixbuf_expander_open = (GdkPixbuf*) g_value_dup_object (value);
break;
case PROP_PIXBUF_EXPANDER_CLOSED:
- pixbuf = (GdkPixbuf*) g_value_get_object (value);
- if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
- if (cellpixbuf->pixbuf_expander_closed)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_closed));
- cellpixbuf->pixbuf_expander_closed = pixbuf;
- g_object_notify (object, "pixbuf_expander_closed");
+ if (priv->pixbuf_expander_closed)
+ g_object_unref (priv->pixbuf_expander_closed);
+ priv->pixbuf_expander_closed = (GdkPixbuf*) g_value_dup_object (value);
+ break;
+ case PROP_STOCK_ID:
+ gtk_cell_renderer_pixbuf_reset (cellpixbuf);
+ _gtk_icon_helper_set_stock_id (priv->icon_helper, g_value_get_string (value), priv->icon_size);
+ break;
+ case PROP_STOCK_SIZE:
+ priv->icon_size = g_value_get_uint (value);
+ _gtk_icon_helper_set_icon_size (priv->icon_helper, priv->icon_size);
+ break;
+ case PROP_STOCK_DETAIL:
+ g_free (priv->stock_detail);
+ priv->stock_detail = g_value_dup_string (value);
+ break;
+ case PROP_ICON_NAME:
+ gtk_cell_renderer_pixbuf_reset (cellpixbuf);
+ _gtk_icon_helper_set_icon_name (priv->icon_helper, g_value_get_string (value), priv->icon_size);
+ break;
+ case PROP_FOLLOW_STATE:
+ priv->follow_state = g_value_get_boolean (value);
+ break;
+ case PROP_GICON:
+ gtk_cell_renderer_pixbuf_reset (cellpixbuf);
+ _gtk_icon_helper_set_gicon (priv->icon_helper, g_value_get_object (value), priv->icon_size);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -215,61 +396,79 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object,
GtkCellRenderer *
gtk_cell_renderer_pixbuf_new (void)
{
- return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_pixbuf_get_type ()));
+ return g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, NULL);
}
static void
-gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
- GtkWidget *widget,
- GdkRectangle *cell_area,
- gint *x_offset,
- gint *y_offset,
- gint *width,
- gint *height)
+gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ const GdkRectangle *cell_area,
+ gint *x_offset,
+ gint *y_offset,
+ gint *width,
+ gint *height)
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
- gint pixbuf_width = 0;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+ gint pixbuf_width = 0;
gint pixbuf_height = 0;
gint calc_width;
gint calc_height;
+ gint xpad, ypad;
+ GtkStyleContext *context;
- if (cellpixbuf->pixbuf)
- {
- pixbuf_width = gdk_pixbuf_get_width (cellpixbuf->pixbuf);
- pixbuf_height = gdk_pixbuf_get_height (cellpixbuf->pixbuf);
- }
- if (cellpixbuf->pixbuf_expander_open)
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_IMAGE);
+
+ if (!_gtk_icon_helper_get_is_empty (priv->icon_helper))
+ _gtk_icon_helper_get_size (priv->icon_helper,
+ gtk_widget_get_style_context (widget),
+ &pixbuf_width, &pixbuf_height);
+
+ gtk_style_context_restore (context);
+
+ if (priv->pixbuf_expander_open)
{
- pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->pixbuf_expander_open));
- pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_open));
+ pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (priv->pixbuf_expander_open));
+ pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (priv->pixbuf_expander_open));
}
- if (cellpixbuf->pixbuf_expander_closed)
+ if (priv->pixbuf_expander_closed)
{
- pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->pixbuf_expander_closed));
- pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed));
+ pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (priv->pixbuf_expander_closed));
+ pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (priv->pixbuf_expander_closed));
}
-
- calc_width = (gint) GTK_CELL_RENDERER (cellpixbuf)->xpad * 2 + pixbuf_width;
- calc_height = (gint) GTK_CELL_RENDERER (cellpixbuf)->ypad * 2 + pixbuf_height;
-
- if (x_offset) *x_offset = 0;
- if (y_offset) *y_offset = 0;
+ gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+ calc_width = (gint) xpad * 2 + pixbuf_width;
+ calc_height = (gint) ypad * 2 + pixbuf_height;
+
if (cell_area && pixbuf_width > 0 && pixbuf_height > 0)
{
+ gfloat xalign, yalign;
+
+ gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
if (x_offset)
{
- *x_offset = GTK_CELL_RENDERER (cellpixbuf)->xalign * (cell_area->width - calc_width - (2 * GTK_CELL_RENDERER (cellpixbuf)->xpad));
- *x_offset = MAX (*x_offset, 0) + GTK_CELL_RENDERER (cellpixbuf)->xpad;
+ *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
+ (1.0 - xalign) : xalign) *
+ (cell_area->width - calc_width));
+ *x_offset = MAX (*x_offset, 0);
}
if (y_offset)
{
- *y_offset = GTK_CELL_RENDERER (cellpixbuf)->yalign * (cell_area->height - calc_height - (2 * GTK_CELL_RENDERER (cellpixbuf)->ypad));
- *y_offset = MAX (*y_offset, 0) + GTK_CELL_RENDERER (cellpixbuf)->ypad;
+ *y_offset = (yalign *
+ (cell_area->height - calc_height));
+ *y_offset = MAX (*y_offset, 0);
}
}
+ else
+ {
+ if (x_offset) *x_offset = 0;
+ if (y_offset) *y_offset = 0;
+ }
- if (calc_width)
+ if (width)
*width = calc_width;
if (height)
@@ -277,62 +476,81 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
}
static void
-gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- guint flags)
+gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
+ cairo_t *cr,
+ GtkWidget *widget,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
- GdkPixbuf *pixbuf;
- guchar *pixels;
- gint rowstride;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+ GtkStyleContext *context;
GdkRectangle pix_rect;
GdkRectangle draw_rect;
+ gboolean is_expander;
+ gint xpad, ypad;
+ GtkStateFlags state;
+ GtkIconHelper *icon_helper = NULL;
+
+ gtk_cell_renderer_pixbuf_get_size (cell, widget, (GdkRectangle *) cell_area,
+ &pix_rect.x,
+ &pix_rect.y,
+ &pix_rect.width,
+ &pix_rect.height);
+
+ gtk_cell_renderer_get_padding (cell, &xpad, &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;
- pixbuf = cellpixbuf->pixbuf;
- if (cell->is_expander)
+ if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
+ return;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_save (context);
+
+ state = GTK_STATE_FLAG_NORMAL;
+
+ if (!gtk_widget_get_sensitive (widget) ||
+ !gtk_cell_renderer_get_sensitive (cell))
+ state |= GTK_STATE_FLAG_INSENSITIVE;
+ else if (priv->follow_state &&
+ (flags & (GTK_CELL_RENDERER_SELECTED |
+ GTK_CELL_RENDERER_PRELIT)) != 0)
+ state = gtk_cell_renderer_get_state (cell, widget, flags);
+
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_IMAGE);
+
+ g_object_get (cell, "is-expander", &is_expander, NULL);
+ if (is_expander)
{
- if (cell->is_expanded &&
- cellpixbuf->pixbuf_expander_open != NULL)
- pixbuf = cellpixbuf->pixbuf_expander_open;
- else if (! cell->is_expanded &&
- cellpixbuf->pixbuf_expander_closed != NULL)
- pixbuf = cellpixbuf->pixbuf_expander_closed;
+ gboolean is_expanded;
+
+ g_object_get (cell, "is-expanded", &is_expanded, NULL);
+
+ if (is_expanded && priv->pixbuf_expander_open != NULL)
+ {
+ icon_helper = _gtk_icon_helper_new ();
+ _gtk_icon_helper_set_pixbuf (icon_helper, priv->pixbuf_expander_open);
+ }
+ else if (!is_expanded && priv->pixbuf_expander_closed != NULL)
+ {
+ icon_helper = _gtk_icon_helper_new ();
+ _gtk_icon_helper_set_pixbuf (icon_helper, priv->pixbuf_expander_closed);
+ }
}
- if (!pixbuf)
- return;
+ if (icon_helper == NULL)
+ icon_helper = g_object_ref (priv->icon_helper);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- pixels = gdk_pixbuf_get_pixels (pixbuf);
+ _gtk_icon_helper_draw (icon_helper,
+ context, cr,
+ pix_rect.x, pix_rect.y);
+ g_object_unref (icon_helper);
- gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
- &pix_rect.x,
- &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,
- /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
- draw_rect.x - pix_rect.x,
- draw_rect.y - pix_rect.y,
- draw_rect.x,
- draw_rect.y,
- draw_rect.width,
- draw_rect.height,
- GDK_PIXBUF_ALPHA_FULL,
- 0,
- GDK_RGB_DITHER_NORMAL,
- 0, 0);
+ gtk_style_context_restore (context);
}