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

iconhelper: check if surface was invalidated

Browse Source 
Fetching the style may cause the surface to be invalidated.
This commit is contained in:
Christian Hergert 2016-04-27 17:45:01 -07:00
parent 055ce9f095
commit 88d0258397
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkiconhelper.c
View File

@ -892,15 +892,21 @@ _gtk_icon_helper_draw (GtkIconHelper *self,
gdouble x,
gdouble y)
{
GtkCssStyle *style;
gtk_icon_helper_ensure_surface (self);
/*
* Get the style first as the rendered surface maybe cleared if the style
* must be recomputed
*/
style = gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self)));
if (self->priv->rendered_surface != NULL)
{
gtk_css_style_render_icon_surface (gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self))),
cr,
self->priv->rendered_surface,
x, y);
}
gtk_css_style_render_icon_surface (style,
cr,
self->priv->rendered_surface,
x, y);
}
gboolean