[gtk+] stylecontext: Remove GTK_CSS_CHANGE_FORCE_INVALIDATE
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] stylecontext: Remove GTK_CSS_CHANGE_FORCE_INVALIDATE
- Date: Wed, 20 Aug 2014 22:56:08 +0000 (UTC)
commit e643ddfd168f81d80400cf67a0ff4b8808ea043c
Author: Benjamin Otte <otte redhat com>
Date: Wed Aug 20 04:39:54 2014 +0200
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.
gtk/gtkcsstypesprivate.h | 1 -
gtk/gtkstylecontext.c | 15 ++-------------
2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 88e5242..c7f9038 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 9808557..93575e1 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]