* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include "gtkcellrendererpixbuf.h"
#include "gtkiconfactory.h"
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_create_named_icon_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
- GtkWidget *widget);
static void gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *rectangle,
enum {
- PROP_ZERO,
- 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_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
};
GtkIconSize stock_size;
gchar *stock_detail;
gboolean follow_state;
-
gchar *icon_name;
+ GIcon *gicon;
};
G_DEFINE_TYPE (GtkCellRendererPixbuf, gtk_cell_renderer_pixbuf, GTK_TYPE_CELL_RENDERER)
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));
}
g_free (priv->stock_detail);
g_free (priv->icon_name);
- (* G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize) (object);
+ if (priv->gicon)
+ g_object_unref (priv->gicon);
+
+ G_OBJECT_CLASS (gtk_cell_renderer_pixbuf_parent_class)->finalize (object);
}
static void
switch (param_id)
{
case PROP_PIXBUF:
- g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf));
+ g_value_set_object (value, cellpixbuf->pixbuf);
break;
case PROP_PIXBUF_EXPANDER_OPEN:
- g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf_expander_open));
+ g_value_set_object (value, cellpixbuf->pixbuf_expander_open);
break;
case PROP_PIXBUF_EXPANDER_CLOSED:
- g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf_expander_closed));
+ g_value_set_object (value, cellpixbuf->pixbuf_expander_closed);
break;
case PROP_STOCK_ID:
g_value_set_string (value, priv->stock_id);
case PROP_ICON_NAME:
g_value_set_string (value, priv->icon_name);
break;
+ case PROP_GICON:
+ g_value_set_object (value, priv->gicon);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
}
-
static void
gtk_cell_renderer_pixbuf_set_property (GObject *object,
guint param_id,
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:
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);
break;
case PROP_STOCK_DETAIL:
- if (priv->stock_detail)
- g_free (priv->stock_detail);
+ g_free (priv->stock_detail);
priv->stock_detail = g_value_dup_string (value);
break;
case PROP_ICON_NAME:
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:
+ if (priv->gicon)
+ {
+ if (cellpixbuf->pixbuf)
+ {
+ g_object_unref (cellpixbuf->pixbuf);
+ cellpixbuf->pixbuf = NULL;
+ g_object_notify (object, "pixbuf");
+ }
+ g_object_unref (priv->gicon);
+ }
+ priv->gicon = (GIcon *) g_value_dup_object (value);
+ if (priv->gicon)
+ {
+ if (cellpixbuf->pixbuf)
+ {
+ g_object_unref (cellpixbuf->pixbuf);
+ cellpixbuf->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);
break;
}
static void
-gtk_cell_renderer_pixbuf_create_named_icon_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
- GtkWidget *widget)
+gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf,
+ GtkWidget *widget)
{
GtkCellRendererPixbufPrivate *priv;
GdkScreen *screen;
GtkIconTheme *icon_theme;
GtkSettings *settings;
gint width, height;
- GError *error = NULL;
priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cellpixbuf);
if (cellpixbuf->pixbuf)
- g_object_unref (cellpixbuf->pixbuf);
+ {
+ g_object_unref (cellpixbuf->pixbuf);
+ cellpixbuf->pixbuf = NULL;
+ }
screen = gtk_widget_get_screen (GTK_WIDGET (widget));
icon_theme = gtk_icon_theme_get_for_screen (screen);
priv->stock_size,
&width, &height))
{
- g_warning ("Invalid icon size %d\n", priv->stock_size);
+ g_warning ("Invalid icon size %u\n", priv->stock_size);
width = height = 24;
}
- cellpixbuf->pixbuf =
- gtk_icon_theme_load_icon (icon_theme,
- priv->icon_name,
- MIN (width, height), 0, &error);
- if (!cellpixbuf->pixbuf)
+ if (priv->icon_name)
+ cellpixbuf->pixbuf = gtk_icon_theme_load_icon (icon_theme,
+ priv->icon_name,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
+ else if (priv->gicon)
{
- g_warning ("could not load image: %s\n", error->message);
- g_error_free (error);
+ GtkIconInfo *info;
+
+ info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+ priv->gicon,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ if (info)
+ {
+ cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, NULL);
+ gtk_icon_info_free (info);
+ }
}
g_object_notify (G_OBJECT (cellpixbuf), "pixbuf");
{
if (priv->stock_id)
gtk_cell_renderer_pixbuf_create_stock_pixbuf (cellpixbuf, widget);
- else if (priv->icon_name)
- gtk_cell_renderer_pixbuf_create_named_icon_pixbuf (cellpixbuf, widget);
+ else if (priv->icon_name || priv->gicon)
+ gtk_cell_renderer_pixbuf_create_themed_pixbuf (cellpixbuf, widget);
}
if (cellpixbuf->pixbuf)
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 (cell_area && pixbuf_width > 0 && pixbuf_height > 0)
{
if (x_offset)
{
*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;
+ (1.0 - cell->xalign) : cell->xalign) *
+ (cell_area->width - calc_width));
+ *x_offset = MAX (*x_offset, 0);
}
if (y_offset)
{
*y_offset = (cell->yalign *
- (cell_area->height - calc_height - 2 * cell->ypad));
- *y_offset = MAX (*y_offset, 0) + cell->ypad;
+ (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 (width)
*width = calc_width;
&pix_rect.width,
&pix_rect.height);
- pix_rect.x += cell_area->x;
- pix_rect.y += cell_area->y;
+ 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;
projects / ~andy / gtk / blobdiff