AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cellrendererpixbuf: Put pixbufs into textures

Browse Source 
... instead of going via surfaces.

A side effect is that the pixbuf property is no longer readable because
we have no good way to get the pixbuf back out of the texture, but I
don't think this matters a lot.

If people want to read the pixbuf property, we need to add some code to
make that work.
This commit is contained in:
Benjamin Otte 2018-03-14 05:21:56 +01:00
parent 7844320f10
commit 3c7ee010f5
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtkcellrendererpixbuf.c
View File

@ -146,7 +146,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
P_("Pixbuf Object"), P_("Pixbuf Object"),
P_("The pixbuf to render"), P_("The pixbuf to render"),
GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
GTK_PARAM_READWRITE)); GTK_PARAM_WRITABLE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_PIXBUF_EXPANDER_OPEN, PROP_PIXBUF_EXPANDER_OPEN,
@ -241,23 +241,9 @@ gtk_cell_renderer_pixbuf_get_property (GObject *object,
{ {
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object); GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv; GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
cairo_surface_t *surface;
GdkPixbuf *pixbuf;
switch (param_id) switch (param_id)
{ {
case PROP_PIXBUF:
pixbuf = NULL;
surface = gtk_image_definition_get_surface (priv->image_def);
if (surface)
{
pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
cairo_image_surface_get_width (surface),
cairo_image_surface_get_height (surface));
cairo_surface_destroy (surface);
}
g_value_take_object (value, pixbuf);
break;
case PROP_PIXBUF_EXPANDER_OPEN: case PROP_PIXBUF_EXPANDER_OPEN:
g_value_set_object (value, priv->pixbuf_expander_open); g_value_set_object (value, priv->pixbuf_expander_open);
break; break;
@ -355,17 +341,18 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object,
{ {
GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object); GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv; GtkCellRendererPixbufPrivate *priv = cellpixbuf->priv;
cairo_surface_t *surface; GdkTexture *texture;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
switch (param_id) switch (param_id)
{ {
case PROP_PIXBUF: case PROP_PIXBUF:
surface = NULL;
pixbuf = g_value_get_object (value); pixbuf = g_value_get_object (value);
if (pixbuf) if (pixbuf)
surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL); texture = gdk_texture_new_for_pixbuf (pixbuf);
take_image_definition (cellpixbuf, gtk_image_definition_new_surface (surface)); else
texture = NULL;
take_image_definition (cellpixbuf, gtk_image_definition_new_texture (texture, 1));
break; break;
case PROP_PIXBUF_EXPANDER_OPEN: case PROP_PIXBUF_EXPANDER_OPEN:
if (priv->pixbuf_expander_open) if (priv->pixbuf_expander_open)
@ -529,7 +516,7 @@ gtk_cell_renderer_pixbuf_snapshot (GtkCellRenderer *cell,
gboolean is_expander; gboolean is_expander;
gint xpad, ypad; gint xpad, ypad;
GtkIconHelper *icon_helper; GtkIconHelper *icon_helper;
cairo_surface_t *surface; GdkTexture *texture;
gtk_cell_renderer_pixbuf_get_size (cell, widget, (GdkRectangle *) cell_area, gtk_cell_renderer_pixbuf_get_size (cell, widget, (GdkRectangle *) cell_area,
&pix_rect.x, &pix_rect.x,
@ -562,16 +549,16 @@ gtk_cell_renderer_pixbuf_snapshot (GtkCellRenderer *cell,
if (is_expanded && priv->pixbuf_expander_open != NULL) if (is_expanded && priv->pixbuf_expander_open != NULL)
{ {
icon_helper = gtk_icon_helper_new (gtk_style_context_get_node (context), widget); icon_helper = gtk_icon_helper_new (gtk_style_context_get_node (context), widget);
surface = gdk_cairo_surface_create_from_pixbuf (priv->pixbuf_expander_open, 1, NULL); texture = gdk_texture_new_for_pixbuf (priv->pixbuf_expander_open);
_gtk_icon_helper_set_surface (icon_helper, surface); _gtk_icon_helper_set_texture (icon_helper, texture);
cairo_surface_destroy (surface); g_object_unref (texture);
} }
else if (!is_expanded && priv->pixbuf_expander_closed != NULL) else if (!is_expanded && priv->pixbuf_expander_closed != NULL)
{ {
icon_helper = gtk_icon_helper_new (gtk_style_context_get_node (context), widget); icon_helper = gtk_icon_helper_new (gtk_style_context_get_node (context), widget);
surface = gdk_cairo_surface_create_from_pixbuf (priv->pixbuf_expander_closed, 1, NULL); texture = gdk_texture_new_for_pixbuf (priv->pixbuf_expander_closed);
_gtk_icon_helper_set_surface (icon_helper, surface); _gtk_icon_helper_set_texture (icon_helper, texture);
cairo_surface_destroy (surface); g_object_unref (texture);
} }
else else
{ {