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

cssprovider: Keep a bitmask for the properties

Browse Source 
That way we can easily tell wich properties are in use.
This commit is contained in:
Benjamin Otte
2011-12-23 14:23:52 +01:00
parent eb38591c91
commit 54d2b9dbc2
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcssprovider.c
View File

@ -27,6 +27,7 @@
#include "gtkcssproviderprivate.h" #include "gtkcssproviderprivate.h"
#include "gtkbitmaskprivate.h"
#include "gtkcssparserprivate.h" #include "gtkcssparserprivate.h"
#include "gtkcsssectionprivate.h" #include "gtkcsssectionprivate.h"
#include "gtkcssselectorprivate.h" #include "gtkcssselectorprivate.h"
@ -960,6 +961,7 @@ struct GtkCssRuleset
GtkCssSelector *selector; GtkCssSelector *selector;
GHashTable *widget_style; GHashTable *widget_style;
GHashTable *style; GHashTable *style;
GtkBitmask *set_styles;
guint has_inherit :1; guint has_inherit :1;
}; };
@ -1109,6 +1111,8 @@ gtk_css_ruleset_init_copy (GtkCssRuleset *new,
g_hash_table_ref (new->widget_style); g_hash_table_ref (new->widget_style);
if (new->style) if (new->style)
g_hash_table_ref (new->style); g_hash_table_ref (new->style);
if (new->set_styles)
new->set_styles = _gtk_bitmask_copy (new->set_styles);
} }
static void static void
@ -1116,6 +1120,8 @@ gtk_css_ruleset_clear (GtkCssRuleset *ruleset)
{ {
if (ruleset->style) if (ruleset->style)
g_hash_table_unref (ruleset->style); g_hash_table_unref (ruleset->style);
if (ruleset->set_styles)
_gtk_bitmask_free (ruleset->set_styles);
if (ruleset->widget_style) if (ruleset->widget_style)
g_hash_table_unref (ruleset->widget_style); g_hash_table_unref (ruleset->widget_style);
if (ruleset->selector) if (ruleset->selector)
@ -1173,10 +1179,13 @@ gtk_css_ruleset_add (GtkCssRuleset *ruleset,
PropertyValue *value) PropertyValue *value)
{ {
if (ruleset->style == NULL) if (ruleset->style == NULL)
ruleset->style = g_hash_table_new_full (g_direct_hash, {
g_direct_equal, ruleset->style = g_hash_table_new_full (g_direct_hash,
NULL, g_direct_equal,
(GDestroyNotify) property_value_free); NULL,
(GDestroyNotify) property_value_free);
ruleset->set_styles = _gtk_bitmask_new ();
}
if (_gtk_style_property_is_shorthand (prop)) if (_gtk_style_property_is_shorthand (prop))
{ {
@ -1200,6 +1209,7 @@ gtk_css_ruleset_add (GtkCssRuleset *ruleset,
return; return;
} }
_gtk_bitmask_set (ruleset->set_styles, _gtk_style_property_get_id (prop), TRUE);
ruleset->has_inherit |= _gtk_style_property_is_inherit (prop); ruleset->has_inherit |= _gtk_style_property_is_inherit (prop);
g_hash_table_insert (ruleset->style, (gpointer) prop, value); g_hash_table_insert (ruleset->style, (gpointer) prop, value);
} }