summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-08-20 04:39:54 +0200
committerBenjamin Otte <otte@redhat.com>2014-08-21 00:54:07 +0200
commite643ddfd168f81d80400cf67a0ff4b8808ea043c (patch)
treeb4c3273783393026c55692d9d193367f9a3e1b15
parent665ad8c6f9dda7284f19353849beed7d7a5b1a68 (diff)
downloadgtk+-e643ddfd168f81d80400cf67a0ff4b8808ea043c.tar.gz
stylecontext: Remove GTK_CSS_CHANGE_FORCE_INVALIDATE
This was introduced as a hackish way in 3.6 to make font updates propagate properly. But since then, font handling has been changed and this flag is no longer necessary.
-rw-r--r--gtk/gtkcsstypesprivate.h1
-rw-r--r--gtk/gtkstylecontext.c15
2 files changed, 2 insertions, 14 deletions
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 88e52425c6..c7f90387c4 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -50,7 +50,6 @@ typedef enum { /*< skip >*/
/* add more */
GTK_CSS_CHANGE_SOURCE = (1 << 16),
GTK_CSS_CHANGE_ANIMATE = (1 << 17),
- GTK_CSS_CHANGE_FORCE_INVALIDATE = (1 << 18),
GTK_CSS_CHANGE_RESERVED_BIT = (1 << 31) /* Used internally in gtkcssselector.c */
} GtkCssChange;
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 9808557056..93575e1c00 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3106,19 +3106,8 @@ _gtk_style_context_validate (GtkStyleContext *context,
_gtk_bitmask_free (animation_changes);
}
- if (change & GTK_CSS_CHANGE_FORCE_INVALIDATE)
- {
- GtkBitmask *full = _gtk_bitmask_new ();
- full = _gtk_bitmask_invert_range (full,
- 0,
- _gtk_css_style_property_get_n_properties ());
- gtk_style_context_do_invalidate (context, full);
- _gtk_bitmask_free (full);
- }
- else if (!_gtk_bitmask_is_empty (changes))
- {
- gtk_style_context_do_invalidate (context, changes);
- }
+ if (!_gtk_bitmask_is_empty (changes))
+ gtk_style_context_do_invalidate (context, changes);
change = _gtk_css_change_for_child (change);
for (list = priv->children; list; list = list->next)