AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-10-01 11:37:35 +00:00
Code Issues Projects Releases Wiki Activity

cssprovider: Add a new setter for rulesets

Browse Source 
We now have set-by-pspec (which is used for normal style properties) and
set-by-name (which is used by widget properties).
This commit is contained in:
Benjamin Otte 2011-05-18 04:30:51 +02:00
parent 0318ab2ce1
commit 399a439103
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkcssprovider.c
View File

@ -955,6 +955,14 @@ gtk_css_ruleset_add_style (GtkCssRuleset *ruleset,
g_hash_table_insert (ruleset->style, name, value); g_hash_table_insert (ruleset->style, name, value);
} }
static void
gtk_css_ruleset_add (GtkCssRuleset *ruleset,
GParamSpec *pspec,
GValue *value)
{
gtk_css_ruleset_add_style (ruleset, g_strdup (pspec->name), value);
}
static gboolean static gboolean
gtk_css_ruleset_matches (GtkCssRuleset *ruleset, gtk_css_ruleset_matches (GtkCssRuleset *ruleset,
GtkWidgetPath *path, GtkWidgetPath *path,
@ -1944,6 +1952,8 @@ parse_declaration (GtkCssScanner *scanner,
{ {
GValue *val; GValue *val;
g_free (name);
val = g_slice_new0 (GValue); val = g_slice_new0 (GValue);
g_value_init (val, pspec->value_type); g_value_init (val, pspec->value_type);
@ -1953,20 +1963,20 @@ parse_declaration (GtkCssScanner *scanner,
* to override other style providers when merged * to override other style providers when merged
*/ */
g_param_value_set_default (pspec, val); g_param_value_set_default (pspec, val);
gtk_css_ruleset_add_style (ruleset, name, val); gtk_css_ruleset_add (ruleset, pspec, val);
} }
else if (strcmp (name, "gtk-key-bindings") == 0) else if (strcmp (pspec->name, "gtk-key-bindings") == 0)
{ {
/* Private property holding the binding sets */ /* Private property holding the binding sets */
resolve_binding_sets (value_str, val); resolve_binding_sets (value_str, val);
gtk_css_ruleset_add_style (ruleset, name, val); gtk_css_ruleset_add (ruleset, pspec, val);
} }
else if (parse_func) else if (parse_func)
{ {
GError *error = NULL; GError *error = NULL;
if ((*parse_func) (value_str, val, &error)) if ((*parse_func) (value_str, val, &error))
gtk_css_ruleset_add_style (ruleset, name, val); gtk_css_ruleset_add (ruleset, pspec, val);
else else
gtk_css_provider_take_error (scanner->provider, scanner, error); gtk_css_provider_take_error (scanner->provider, scanner, error);
} }
@ -1979,13 +1989,12 @@ parse_declaration (GtkCssScanner *scanner,
value_str, value_str,
&error)) &error))
{ {
gtk_css_ruleset_add_style (ruleset, name, val); gtk_css_ruleset_add (ruleset, pspec, val);
} }
else else
{ {
g_value_unset (val); g_value_unset (val);
g_slice_free (GValue, val); g_slice_free (GValue, val);
g_free (name);
gtk_css_provider_take_error (scanner->provider, scanner, error); gtk_css_provider_take_error (scanner->provider, scanner, error);
} }