callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssnode: Handle invalidate queueing differently

Browse Source 
Instead of directly requesting the layout phase, register a tick
callback. This is what the docs suggest for animations and it's what we
need for the next commit.
This commit is contained in:
Benjamin Otte 2015-02-07 18:53:07 +01:00
parent cdd964a3af
commit 020f3f11c8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkcsswidgetnode.c
View File

@ -46,9 +46,22 @@ gtk_css_widget_node_queue_validate (GtkCssNode *node)
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_RESIZE_CONTAINER (widget_node->widget)) if (GTK_IS_RESIZE_CONTAINER (widget_node->widget))
{ widget_node->validate_cb_id = gtk_widget_add_tick_callback (widget_node->widget,
_gtk_container_queue_restyle (GTK_CONTAINER (widget_node->widget)); (GtkTickCallback) _gtk_container_queue_restyle,
} NULL,
NULL);
G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
gtk_css_widget_node_dequeue_validate (GtkCssNode *node)
{
GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_RESIZE_CONTAINER (widget_node->widget))
gtk_widget_remove_tick_callback (widget_node->widget,
widget_node->validate_cb_id);
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS
} }
@ -204,6 +217,7 @@ gtk_css_widget_node_class_init (GtkCssWidgetNodeClass *klass)
node_class->update_style = gtk_css_widget_node_update_style; node_class->update_style = gtk_css_widget_node_update_style;
node_class->validate = gtk_css_widget_node_validate; node_class->validate = gtk_css_widget_node_validate;
node_class->queue_validate = gtk_css_widget_node_queue_validate; node_class->queue_validate = gtk_css_widget_node_queue_validate;
node_class->dequeue_validate = gtk_css_widget_node_dequeue_validate;
node_class->create_widget_path = gtk_css_widget_node_create_widget_path; node_class->create_widget_path = gtk_css_widget_node_create_widget_path;
node_class->get_widget_path = gtk_css_widget_node_get_widget_path; node_class->get_widget_path = gtk_css_widget_node_get_widget_path;
node_class->get_style_provider = gtk_css_widget_node_get_style_provider; node_class->get_style_provider = gtk_css_widget_node_get_style_provider;

1
gtk/gtkcsswidgetnodeprivate.h
View File

@ -38,6 +38,7 @@ struct _GtkCssWidgetNode
GtkCssNode node; GtkCssNode node;
GtkWidget *widget; GtkWidget *widget;
guint validate_cb_id;
}; };
struct _GtkCssWidgetNodeClass struct _GtkCssWidgetNodeClass