[gtk/cherry-pick-947c3e9f] Merge branch 'benzea/fix-css-update' into 'gtk-3-24'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/cherry-pick-947c3e9f] Merge branch 'benzea/fix-css-update' into 'gtk-3-24'
- Date: Tue, 16 Jun 2020 13:11:11 +0000 (UTC)
commit 9b363a62fea3047ca8f472963296007622a3099c
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Mon Jun 15 20:13:56 2020 +0000
Merge branch 'benzea/fix-css-update' into 'gtk-3-24'
Fix CSS update loop
See merge request GNOME/gtk!2093
(cherry picked from commit 947c3e9f723ef733ab46e4dce34fa41b91cb0604)
7a5caf1b cssnode: Don't queue_validate/deque_validate invisible nodes
gtk/gtkcssnode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 9184ffe928..b8522a1e37 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -681,14 +681,14 @@ gtk_css_node_get_timestamp (GtkCssNode *cssnode)
static void
gtk_css_node_parent_was_unset (GtkCssNode *node)
{
- if (node->invalid)
+ if (node->visible && node->invalid)
GTK_CSS_NODE_GET_CLASS (node)->queue_validate (node);
}
static void
gtk_css_node_parent_will_be_set (GtkCssNode *node)
{
- if (node->invalid)
+ if (node->visible && node->invalid)
GTK_CSS_NODE_GET_CLASS (node)->dequeue_validate (node);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]