[gtk+/wip/cssnode3: 67/91] cssnode: Change the way we start animations
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cssnode3: 67/91] cssnode: Change the way we start animations
- Date: Mon, 9 Mar 2015 14:11:08 +0000 (UTC)
commit c4d45067c2992295cd519230cf210d9ba0085b83
Author: Benjamin Otte <otte redhat com>
Date: Sat Feb 21 03:40:46 2015 +0100
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.
gtk/gtkcsswidgetnode.c | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c
index 2860d08..8fff931 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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]