#include "gtkicontheme.h"
#include "gtkintl.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
+
static void gtk_cell_renderer_pixbuf_get_property (GObject *object,
guint param_id,
};
-#define GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufPrivate))
-
-typedef struct _GtkCellRendererPixbufPrivate GtkCellRendererPixbufPrivate;
struct _GtkCellRendererPixbufPrivate
{
- gchar *stock_id;
GtkIconSize stock_size;
- gchar *stock_detail;
+
+ GdkPixbuf *pixbuf;
+ GdkPixbuf *pixbuf_expander_open;
+ GdkPixbuf *pixbuf_expander_closed;
+
+ GIcon *gicon;
+
gboolean follow_state;
+
+ gchar *stock_id;
+ gchar *stock_detail;
gchar *icon_name;
- GIcon *gicon;
};
+
G_DEFINE_TYPE (GtkCellRendererPixbuf, gtk_cell_renderer_pixbuf, GTK_TYPE_CELL_RENDERER)
+
static void
gtk_cell_renderer_pixbuf_init (GtkCellRendererPixbuf *cellpixbuf)
{
GtkCellRendererPixbufPrivate *priv;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cellpixbuf);
+ cellpixbuf->priv = G_TYPE_INSTANCE_GET_PRIVATE (cellpixbuf,
+ GTK_TYPE_CELL_RENDERER_PIXBUF,
+ GtkCellRendererPixbufPrivate);
+ priv = cellpixbuf->priv;
+
priv->stock_size = GTK_ICON_SIZE_MENU;
}
gtk_cell_renderer_pixbuf_finalize (GObject *object)
{
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (object);
-
- if (cellpixbuf->pixbuf)
- g_object_unref (cellpixbuf->pixbuf);
- if (cellpixbuf->pixbuf_expander_open)
- g_object_unref (cellpixbuf->pixbuf_expander_open);
- if (cellpixbuf->pixbuf_expander_closed)
- g_object_unref (cellpixbuf->pixbuf_expander_closed);
+ if (priv->pixbuf)
+ g_object_unref (priv->pixbuf);
+ 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_id);
g_free (priv->stock_detail);
GParamSpec *pspec)
{
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (object);
-
switch (param_id)
{
case PROP_PIXBUF:
- g_value_set_object (value, cellpixbuf->pixbuf);
+ g_value_set_object (value, priv->pixbuf);
break;
case PROP_PIXBUF_EXPANDER_OPEN:
- g_value_set_object (value, cellpixbuf->pixbuf_expander_open);
+ 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_value_set_object (value, priv->pixbuf_expander_closed);
break;
case PROP_STOCK_ID:
g_value_set_string (value, priv->stock_id);
}
}
-static void
-unset_image_properties (GtkCellRendererPixbuf *cell)
-{
- GtkCellRendererPixbufPrivate *priv;
-
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cell);
-
- if (priv->stock_id)
- {
- g_free (priv->stock_id);
- priv->stock_id = NULL;
- g_object_notify (G_OBJECT (cell), "stock-id");
- }
- if (priv->icon_name)
- {
- g_free (priv->icon_name);
- priv->icon_name = NULL;
- g_object_notify (G_OBJECT (cell), "icon-name");
- }
- if (cell->pixbuf)
- {
- g_object_unref (cell->pixbuf);
- cell->pixbuf = NULL;
- g_object_notify (G_OBJECT (cell), "pixbuf");
- }
- if (priv->gicon)
- {
- g_object_unref (priv->gicon);
- priv->gicon = NULL;
- g_object_notify (G_OBJECT (cell), "gicon");
- }
-}
-
static void
gtk_cell_renderer_pixbuf_set_property (GObject *object,
guint param_id,
GParamSpec *pspec)
{
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (object);
-
switch (param_id)
{
case PROP_PIXBUF:
- unset_image_properties (cellpixbuf);
- cellpixbuf->pixbuf = (GdkPixbuf *) g_value_dup_object (value);
+ if (priv->pixbuf)
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = (GdkPixbuf*) g_value_dup_object (value);
+ if (priv->pixbuf)
+ {
+ if (priv->stock_id)
+ {
+ g_free (priv->stock_id);
+ priv->stock_id = NULL;
+ g_object_notify (object, "stock-id");
+ }
+ if (priv->icon_name)
+ {
+ g_free (priv->icon_name);
+ priv->icon_name = NULL;
+ g_object_notify (object, "icon-name");
+ }
+ if (priv->gicon)
+ {
+ g_object_unref (priv->gicon);
+ priv->gicon = NULL;
+ g_object_notify (object, "gicon");
+ }
+ }
break;
case PROP_PIXBUF_EXPANDER_OPEN:
- if (cellpixbuf->pixbuf_expander_open)
- g_object_unref (cellpixbuf->pixbuf_expander_open);
- cellpixbuf->pixbuf_expander_open = (GdkPixbuf*) g_value_dup_object (value);
+ 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:
- if (cellpixbuf->pixbuf_expander_closed)
- g_object_unref (cellpixbuf->pixbuf_expander_closed);
- cellpixbuf->pixbuf_expander_closed = (GdkPixbuf*) g_value_dup_object (value);
+ 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:
- unset_image_properties (cellpixbuf);
+ if (priv->stock_id)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ g_free (priv->stock_id);
+ }
priv->stock_id = g_value_dup_string (value);
+ if (priv->stock_id)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ if (priv->icon_name)
+ {
+ g_free (priv->icon_name);
+ priv->icon_name = NULL;
+ g_object_notify (object, "icon-name");
+ }
+ if (priv->gicon)
+ {
+ g_object_unref (priv->gicon);
+ priv->gicon = NULL;
+ g_object_notify (object, "gicon");
+ }
+ }
break;
case PROP_STOCK_SIZE:
priv->stock_size = g_value_get_uint (value);
priv->stock_detail = g_value_dup_string (value);
break;
case PROP_ICON_NAME:
- unset_image_properties (cellpixbuf);
+ if (priv->icon_name)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ g_free (priv->icon_name);
+ }
priv->icon_name = g_value_dup_string (value);
+ if (priv->icon_name)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ if (priv->stock_id)
+ {
+ g_free (priv->stock_id);
+ priv->stock_id = NULL;
+ g_object_notify (object, "stock-id");
+ }
+ if (priv->gicon)
+ {
+ g_object_unref (priv->gicon);
+ priv->gicon = NULL;
+ g_object_notify (object, "gicon");
+ }
+ }
break;
case PROP_FOLLOW_STATE:
priv->follow_state = g_value_get_boolean (value);
break;
case PROP_GICON:
- unset_image_properties (cellpixbuf);
+ if (priv->gicon)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ g_object_unref (priv->gicon);
+ }
priv->gicon = (GIcon *) g_value_dup_object (value);
+ if (priv->gicon)
+ {
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ if (priv->stock_id)
+ {
+ g_free (priv->stock_id);
+ priv->stock_id = NULL;
+ g_object_notify (object, "stock-id");
+ }
+ if (priv->icon_name)
+ {
+ g_free (priv->icon_name);
+ priv->icon_name = NULL;
+ g_object_notify (object, "icon-name");
+ }
+ }
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
gtk_cell_renderer_pixbuf_create_stock_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
GtkWidget *widget)
{
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cellpixbuf);
+ if (priv->pixbuf)
+ g_object_unref (priv->pixbuf);
- if (cellpixbuf->pixbuf)
- g_object_unref (cellpixbuf->pixbuf);
-
- cellpixbuf->pixbuf = gtk_widget_render_icon (widget,
+ priv->pixbuf = gtk_widget_render_icon (widget,
priv->stock_id,
priv->stock_size,
priv->stock_detail);
gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
GtkWidget *widget)
{
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
GdkScreen *screen;
GtkIconTheme *icon_theme;
GtkSettings *settings;
gint width, height;
- GError *error = NULL;
+ GtkIconInfo *info;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cellpixbuf);
-
- if (cellpixbuf->pixbuf)
+ if (priv->pixbuf)
{
- g_object_unref (cellpixbuf->pixbuf);
- cellpixbuf->pixbuf = NULL;
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
}
screen = gtk_widget_get_screen (GTK_WIDGET (widget));
}
if (priv->icon_name)
- cellpixbuf->pixbuf = gtk_icon_theme_load_icon (icon_theme,
- priv->icon_name,
- MIN (width, height),
- GTK_ICON_LOOKUP_USE_BUILTIN,
- &error);
+ info = gtk_icon_theme_lookup_icon (icon_theme,
+ priv->icon_name,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
else if (priv->gicon)
+ info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+ priv->gicon,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ else
+ info = NULL;
+
+ if (info)
{
- GtkIconInfo *info;
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (GTK_WIDGET (widget));
+ priv->pixbuf = gtk_icon_info_load_symbolic_for_style (info,
+ style,
+ GTK_STATE_NORMAL,
+ NULL,
+ NULL);
+ gtk_icon_info_free (info);
+ }
- info = gtk_icon_theme_lookup_by_gicon (icon_theme,
- priv->gicon,
- MIN (width, height),
- GTK_ICON_LOOKUP_USE_BUILTIN);
- if (!info)
- {
- g_set_error (&error, GTK_ICON_THEME_ERROR, GTK_ICON_THEME_NOT_FOUND,
- _("Icon not present in theme"));
- }
- else
- {
- cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, &error);
- gtk_icon_info_free (info);
- }
+ g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
+}
+
+static GdkPixbuf *
+create_symbolic_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+ GtkWidget *widget,
+ GtkStateType state)
+{
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
+ GdkScreen *screen;
+ GtkIconTheme *icon_theme;
+ GtkSettings *settings;
+ gint width, height;
+ GtkIconInfo *info;
+ GdkPixbuf *pixbuf;
+
+ /* Not a named symbolic icon? */
+ if (priv->icon_name) {
+ if (!g_str_has_suffix (priv->icon_name, "-symbolic"))
+ return NULL;
+ } else if (priv->gicon) {
+ const gchar * const *names;
+ if (!G_IS_THEMED_ICON (priv->gicon))
+ return NULL;
+ names = g_themed_icon_get_names (G_THEMED_ICON (priv->gicon));
+ if (names == NULL || !g_str_has_suffix (names[0], "-symbolic"))
+ return NULL;
+ } else {
+ return NULL;
+ }
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (widget));
+ icon_theme = gtk_icon_theme_get_for_screen (screen);
+ settings = gtk_settings_get_for_screen (screen);
+
+ if (!gtk_icon_size_lookup_for_settings (settings,
+ priv->stock_size,
+ &width, &height))
+ {
+ g_warning ("Invalid icon size %u\n", priv->stock_size);
+ width = height = 24;
}
- if (!cellpixbuf->pixbuf)
- {
- g_warning ("could not load image: %s\n", error->message);
- g_error_free (error);
+
+ if (priv->icon_name)
+ info = gtk_icon_theme_lookup_icon (icon_theme,
+ priv->icon_name,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ else if (priv->gicon)
+ info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+ priv->gicon,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ else
+ return NULL;
+
+ if (info)
+ {
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (GTK_WIDGET (widget));
+ pixbuf = gtk_icon_info_load_symbolic_for_style (info,
+ style, state,
+ NULL, NULL);
+ gtk_icon_info_free (info);
+ return pixbuf;
}
- g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
+ return NULL;
}
static GdkPixbuf *
gint *height)
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
gint pixbuf_width = 0;
gint pixbuf_height = 0;
gint calc_width;
gint calc_height;
+ gint xpad, ypad;
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cell);
-
- if (!cellpixbuf->pixbuf)
+ if (!priv->pixbuf)
{
if (priv->stock_id)
gtk_cell_renderer_pixbuf_create_stock_pixbuf (cellpixbuf, widget);
gtk_cell_renderer_pixbuf_create_themed_pixbuf (cellpixbuf, widget);
}
- if (cellpixbuf->pixbuf)
+ if (priv->pixbuf)
{
- pixbuf_width = gdk_pixbuf_get_width (cellpixbuf->pixbuf);
- pixbuf_height = gdk_pixbuf_get_height (cellpixbuf->pixbuf);
+ pixbuf_width = gdk_pixbuf_get_width (priv->pixbuf);
+ pixbuf_height = gdk_pixbuf_get_height (priv->pixbuf);
}
- if (cellpixbuf->pixbuf_expander_open)
+ 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) cell->xpad * 2 + pixbuf_width;
- calc_height = (gint) cell->ypad * 2 + pixbuf_height;
+
+ 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_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
- (1.0 - cell->xalign) : cell->xalign) *
+ (1.0 - xalign) : xalign) *
(cell_area->width - calc_width));
*x_offset = MAX (*x_offset, 0);
}
if (y_offset)
{
- *y_offset = (cell->yalign *
+ *y_offset = (yalign *
(cell_area->height - calc_height));
*y_offset = MAX (*y_offset, 0);
}
{
GtkCellRendererPixbuf *cellpixbuf = (GtkCellRendererPixbuf *) cell;
- GtkCellRendererPixbufPrivate *priv;
+ GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
GdkPixbuf *pixbuf;
GdkPixbuf *invisible = NULL;
GdkPixbuf *colorized = NULL;
+ GdkPixbuf *symbolic = NULL;
GdkRectangle pix_rect;
GdkRectangle draw_rect;
cairo_t *cr;
-
- priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cell);
+ gboolean is_expander;
+ gint xpad, ypad;
gtk_cell_renderer_pixbuf_get_size (cell, widget, cell_area,
&pix_rect.x,
&pix_rect.width,
&pix_rect.height);
- pix_rect.x += cell_area->x + cell->xpad;
- pix_rect.y += cell_area->y + cell->ypad;
- pix_rect.width -= cell->xpad * 2;
- pix_rect.height -= cell->ypad * 2;
+ 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;
if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) ||
!gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
return;
- pixbuf = cellpixbuf->pixbuf;
+ pixbuf = priv->pixbuf;
- if (cell->is_expander)
+ 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)
+ pixbuf = priv->pixbuf_expander_open;
+ else if (!is_expanded &&
+ priv->pixbuf_expander_closed != NULL)
+ pixbuf = priv->pixbuf_expander_closed;
}
if (!pixbuf)
return;
- if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE || !cell->sensitive)
+ if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE ||
+ !gtk_cell_renderer_get_sensitive (cell))
{
GtkIconSource *source;
*/
gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_icon_source_set_size_wildcarded (source, FALSE);
-
- invisible = gtk_style_render_icon (widget->style,
+
+ invisible = gtk_style_render_icon (gtk_widget_get_style (widget),
source,
gtk_widget_get_direction (widget),
GTK_STATE_INSENSITIVE,
if ((flags & GTK_CELL_RENDERER_SELECTED) != 0)
{
- if (GTK_WIDGET_HAS_FOCUS (widget))
+ if (gtk_widget_has_focus (widget))
state = GTK_STATE_SELECTED;
else
state = GTK_STATE_ACTIVE;
else
state = GTK_STATE_PRELIGHT;
- colorized = create_colorized_pixbuf (pixbuf,
- &widget->style->base[state]);
+ symbolic = create_symbolic_pixbuf (cellpixbuf, widget, state);
+ if (!symbolic) {
+ colorized = create_colorized_pixbuf (pixbuf,
+ >k_widget_get_style (widget)->base[state]);
- pixbuf = colorized;
+ pixbuf = colorized;
+ } else {
+ pixbuf = symbolic;
+ }
}
cr = gdk_cairo_create (window);
if (colorized)
g_object_unref (colorized);
-}
-#define __GTK_CELL_RENDERER_PIXBUF_C__
-#include "gtkaliasdef.c"
+ if (symbolic)
+ g_object_unref (symbolic);
+}