[gtk+] Revert "iconhelper: check if surface was invalidated"
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "iconhelper: check if surface was invalidated"
- Date: Thu, 28 Apr 2016 02:03:11 +0000 (UTC)
commit 8fc11ef2a513b3029c208b2d37d3716998a9389c
Author: Christian Hergert <chergert redhat com>
Date: Wed Apr 27 19:02:25 2016 -0700
Revert "iconhelper: check if surface was invalidated"
This reverts commit 88d02583974659d1d37d825df78c79bee4c95d0e.
gtk/gtkiconhelper.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 7baccb0..b8737e7 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -892,21 +892,15 @@ _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 (style,
- cr,
- self->priv->rendered_surface,
- x, y);
+ {
+ 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);
+ }
}
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]