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_finalize (GObject *object);
+static void gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+ GtkWidget *widget);
static void gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *rectangle,
gint *width,
gint *height);
static void gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ GdkDrawable *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
- guint flags);
+ GtkCellRendererState flags);
enum {
PROP_ZERO,
PROP_PIXBUF,
PROP_PIXBUF_EXPANDER_OPEN,
- PROP_PIXBUF_EXPANDER_CLOSED
+ PROP_PIXBUF_EXPANDER_CLOSED,
+ PROP_STOCK_ID,
+ PROP_STOCK_SIZE,
+ PROP_STOCK_DETAIL
};
+static gpointer parent_class;
-GtkType
+#define CELLINFO_KEY "gtk-cell-renderer-pixbuf-info"
+
+typedef struct _GtkCellRendererPixbufInfo GtkCellRendererPixbufInfo;
+struct _GtkCellRendererPixbufInfo
+{
+ gchar *stock_id;
+ GtkIconSize stock_size;
+ gchar *stock_detail;
+};
+
+GType
gtk_cell_renderer_pixbuf_get_type (void)
{
- static GtkType cell_pixbuf_type = 0;
+ static GType cell_pixbuf_type = 0;
- 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);
- }
+ 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,
+ };
- return cell_pixbuf_type;
+ cell_pixbuf_type =
+ g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererPixbuf",
+ &cell_pixbuf_info, 0);
+ }
+
+ return cell_pixbuf_type;
}
static void
gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *cellpixbuf)
{
+ GtkCellRendererPixbufInfo *cellinfo;
+
+ cellinfo = g_new0 (GtkCellRendererPixbufInfo, 1);
+ cellinfo->stock_size = GTK_ICON_SIZE_MENU;
+ g_object_set_data (G_OBJECT (cellpixbuf), CELLINFO_KEY, cellinfo);
}
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);
+
+ parent_class = g_type_class_peek_parent (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",
+ _("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));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_ID,
+ g_param_spec_string ("stock_id",
+ _("Stock ID"),
+ _("The stock ID of the stock icon to render"),
+ NULL,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_SIZE,
+ g_param_spec_enum ("stock_size",
+ _("Size"),
+ _("The size of the rendered icon"),
+ GTK_TYPE_ICON_SIZE,
+ GTK_ICON_SIZE_MENU,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_STOCK_DETAIL,
+ g_param_spec_string ("stock_detail",
+ _("Detail"),
+ _("Render detail to pass to the theme engine"),
+ NULL,
+ G_PARAM_READWRITE));
+}
+
+static void
+gtk_cell_renderer_pixbuf_finalize (GObject *object)
+{
+ GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (object, CELLINFO_KEY);
+
+ if (cellpixbuf->pixbuf && cellinfo->stock_id)
+ g_object_unref (cellpixbuf->pixbuf);
+
+ if (cellinfo->stock_id)
+ g_free (cellinfo->stock_id);
+
+ if (cellinfo->stock_detail)
+ g_free (cellinfo->stock_detail);
+
+ g_free (cellinfo);
+ g_object_set_data (object, CELLINFO_KEY, NULL);
+
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
GParamSpec *pspec)
{
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (object, CELLINFO_KEY);
switch (param_id)
{
g_value_set_object (value,
cellpixbuf->pixbuf_expander_closed ? G_OBJECT (cellpixbuf->pixbuf_expander_closed) : NULL);
break;
+ case PROP_STOCK_ID:
+ g_value_set_string (value, cellinfo->stock_id);
+ break;
+ case PROP_STOCK_SIZE:
+ g_value_set_enum (value, cellinfo->stock_size);
+ break;
+ case PROP_STOCK_DETAIL:
+ g_value_set_string (value, cellinfo->stock_detail);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
{
GdkPixbuf *pixbuf;
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (object, CELLINFO_KEY);
switch (param_id)
{
case PROP_PIXBUF:
pixbuf = (GdkPixbuf*) g_value_get_object (value);
if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
+ g_object_ref (pixbuf);
if (cellpixbuf->pixbuf)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf));
+ g_object_unref (cellpixbuf->pixbuf);
cellpixbuf->pixbuf = pixbuf;
- g_object_notify (object, "pixbuf");
break;
case PROP_PIXBUF_EXPANDER_OPEN:
pixbuf = (GdkPixbuf*) g_value_get_object (value);
if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
+ g_object_ref (pixbuf);
if (cellpixbuf->pixbuf_expander_open)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_open));
+ g_object_unref (cellpixbuf->pixbuf_expander_open);
cellpixbuf->pixbuf_expander_open = pixbuf;
- g_object_notify (object, "pixbuf_expander_open");
break;
case PROP_PIXBUF_EXPANDER_CLOSED:
pixbuf = (GdkPixbuf*) g_value_get_object (value);
if (pixbuf)
- g_object_ref (G_OBJECT (pixbuf));
+ g_object_ref (pixbuf);
if (cellpixbuf->pixbuf_expander_closed)
- g_object_unref (G_OBJECT (cellpixbuf->pixbuf_expander_closed));
+ g_object_unref (cellpixbuf->pixbuf_expander_closed);
cellpixbuf->pixbuf_expander_closed = pixbuf;
- g_object_notify (object, "pixbuf_expander_closed");
+ break;
+ case PROP_STOCK_ID:
+ if (cellinfo->stock_id)
+ g_free (cellinfo->stock_id);
+ cellinfo->stock_id = g_strdup (g_value_get_string (value));
+ break;
+ case PROP_STOCK_SIZE:
+ cellinfo->stock_size = g_value_get_enum (value);
+ break;
+ case PROP_STOCK_DETAIL:
+ if (cellinfo->stock_detail)
+ g_free (cellinfo->stock_detail);
+ cellinfo->stock_detail = g_strdup (g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
+
+ if (cellpixbuf->pixbuf && cellinfo->stock_id)
+ {
+ g_object_unref (cellpixbuf->pixbuf);
+ cellpixbuf->pixbuf = NULL;
+ }
}
/**
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_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+ GtkWidget *widget)
+{
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (G_OBJECT (cellpixbuf), CELLINFO_KEY);
+
+ if (cellpixbuf->pixbuf)
+ g_object_unref (cellpixbuf->pixbuf);
+
+ cellpixbuf->pixbuf = gtk_widget_render_icon (widget,
+ cellinfo->stock_id,
+ cellinfo->stock_size,
+ cellinfo->stock_detail);
}
static void
gint *height)
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
- gint pixbuf_width = 0;
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (G_OBJECT (cell), CELLINFO_KEY);
+ gint pixbuf_width = 0;
gint pixbuf_height = 0;
gint calc_width;
gint calc_height;
+ if (!cellpixbuf->pixbuf && cellinfo->stock_id)
+ gtk_cell_renderer_pixbuf_create_stock_pixbuf (cellpixbuf, widget);
+
if (cellpixbuf->pixbuf)
{
- pixbuf_width = gdk_pixbuf_get_width (cellpixbuf->pixbuf);
+ pixbuf_width = gdk_pixbuf_get_width (cellpixbuf->pixbuf);
pixbuf_height = gdk_pixbuf_get_height (cellpixbuf->pixbuf);
}
if (cellpixbuf->pixbuf_expander_open)
{
- pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->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));
}
if (cellpixbuf->pixbuf_expander_closed)
{
- pixbuf_width = MAX (pixbuf_width, gdk_pixbuf_get_width (cellpixbuf->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));
}
- calc_width = (gint) GTK_CELL_RENDERER (cellpixbuf)->xpad * 2 + pixbuf_width;
- calc_height = (gint) GTK_CELL_RENDERER (cellpixbuf)->ypad * 2 + pixbuf_height;
+ calc_width = (gint) cell->xpad * 2 + pixbuf_width;
+ calc_height = (gint) cell->ypad * 2 + pixbuf_height;
if (x_offset) *x_offset = 0;
if (y_offset) *y_offset = 0;
{
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 - cell->xalign : cell->xalign) *
+ (cell_area->width - calc_width - 2 * cell->xpad));
+ *x_offset = MAX (*x_offset, 0) + cell->xpad;
}
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 = (cell->yalign *
+ (cell_area->height - calc_height - 2 * cell->ypad));
+ *y_offset = MAX (*y_offset, 0) + cell->ypad;
}
}
- if (calc_width)
+ if (width)
*width = calc_width;
if (height)
}
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,
+ GdkWindow *window,
+ GtkWidget *widget,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GdkRectangle *expose_area,
+ GtkCellRendererState flags)
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
+ GtkCellRendererPixbufInfo *cellinfo = g_object_get_data (G_OBJECT (cell), CELLINFO_KEY);
GdkPixbuf *pixbuf;
GdkRectangle pix_rect;
GdkRectangle draw_rect;
+ gboolean stock_pixbuf = FALSE;
pixbuf = cellpixbuf->pixbuf;
if (cell->is_expander)
pixbuf = cellpixbuf->pixbuf_expander_closed;
}
- if (!pixbuf)
+ if (!pixbuf && !cellinfo->stock_id)
return;
+ else if (!pixbuf && cellinfo->stock_id)
+ stock_pixbuf = TRUE;
gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
&pix_rect.x,
&pix_rect.y,
&pix_rect.width,
&pix_rect.height);
+
+ if (stock_pixbuf)
+ pixbuf = cellpixbuf->pixbuf;
pix_rect.x += cell_area->x;
pix_rect.y += cell_area->y;
- pix_rect.width -= cell->xpad * 2;
+ 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);
+
+ if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) &&
+ gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
+ gdk_draw_pixbuf (window,
+ widget->style->black_gc,
+ pixbuf,
+ /* 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_RGB_DITHER_NORMAL,
+ 0, 0);
}
projects / ~andy / gtk / blobdiff