summaryrefslogtreecommitdiff
path: root/gtk/gtkcsswidgetnode.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-02-21 03:40:46 +0100
committerBenjamin Otte <otte@redhat.com>2015-03-18 15:23:32 +0100
commit295441733520ac2d5a76d45d3d920f0f40c8e288 (patch)
treef4ad19bbc3f5ad000e0bb965b7dfc2f776c57243 /gtk/gtkcsswidgetnode.c
parent172f345d01f17cf6cfde3456d14436fe468a672f (diff)
downloadgtk+-295441733520ac2d5a76d45d3d920f0f40c8e288.tar.gz
cssnode: Change the way we start animations
We now have a flag for "invalidate animations", use that to restart animations and decide if we want to start transitions.
Diffstat (limited to 'gtk/gtkcsswidgetnode.c')
-rw-r--r--gtk/gtkcsswidgetnode.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c
index 2860d081a5..8fff93117d 100644
--- a/gtk/gtkcsswidgetnode.c
+++ b/gtk/gtkcsswidgetnode.c
@@ -85,22 +85,9 @@ gtk_css_widget_node_dequeue_validate (GtkCssNode *node)
}
static gboolean
-gtk_css_widget_node_should_create_transitions (GtkCssWidgetNode *widget_node,
- GtkCssStyle *previous_style)
+should_create_transitions (GtkCssChange change)
{
- GtkWidget *widget;
-
- widget = widget_node->widget;
- if (widget == NULL)
- return FALSE;
-
- if (!gtk_widget_get_mapped (widget))
- return FALSE;
-
- if (previous_style == gtk_css_static_style_get_default ())
- return FALSE;
-
- return TRUE;
+ return (change & GTK_CSS_CHANGE_ANIMATIONS) == 0;
}
static gboolean
@@ -168,7 +155,7 @@ gtk_css_widget_node_validate (GtkCssNode *node,
parent ? gtk_css_node_get_style (parent) : NULL,
timestamp,
gtk_css_node_get_style_provider (node),
- gtk_css_widget_node_should_create_transitions (widget_node, style) ? style : NULL);
+ should_create_transitions (change) ? style : NULL);
g_object_unref (new_static_style);
}