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

stylecontext: Remove GTK_CSS_CHANGE_FORCE_INVALIDATE

Browse Source 
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.
This commit is contained in:
Benjamin Otte 2014-08-20 04:39:54 +02:00
parent 665ad8c6f9
commit e643ddfd16
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtkcsstypesprivate.h
View File

@ -50,7 +50,6 @@ typedef enum { /*< skip >*/
/* add more */ /* add more */
GTK_CSS_CHANGE_SOURCE = (1 << 16), GTK_CSS_CHANGE_SOURCE = (1 << 16),
GTK_CSS_CHANGE_ANIMATE = (1 << 17), 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 */ GTK_CSS_CHANGE_RESERVED_BIT = (1 << 31) /* Used internally in gtkcssselector.c */
} GtkCssChange; } GtkCssChange;

13
gtk/gtkstylecontext.c
View File

@ -3106,19 +3106,8 @@ _gtk_style_context_validate (GtkStyleContext *context,
_gtk_bitmask_free (animation_changes); _gtk_bitmask_free (animation_changes);
} }
if (change & GTK_CSS_CHANGE_FORCE_INVALIDATE) if (!_gtk_bitmask_is_empty (changes))
{
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); gtk_style_context_do_invalidate (context, changes);
}
change = _gtk_css_change_for_child (change); change = _gtk_css_change_for_child (change);
for (list = priv->children; list; list = list->next) for (list = priv->children; list; list = list->next)