AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

shorthandproperty: Return unset/initial/inherit as-is

Browse Source 
We don't even need an array value these days.
This commit is contained in:
Timm Bäder 2020-04-18 10:55:15 +02:00
parent 526187d36c
commit f4edbdfc1f
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcssshorthandproperty.c
View File

@ -79,10 +79,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
/* the initial value can be explicitly specified with the /* the initial value can be explicitly specified with the
* ‘initial’ keyword which all properties accept. * ‘initial’ keyword which all properties accept.
*/ */
for (i = 0; i < shorthand->subproperties->len; i++) return _gtk_css_initial_value_new ();
{
data[i] = _gtk_css_initial_value_new ();
}
} }
else if (gtk_css_parser_try_ident (parser, "inherit")) else if (gtk_css_parser_try_ident (parser, "inherit"))
{ {
@ -92,10 +89,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
* strengthen inherited values in the cascade, and it can * strengthen inherited values in the cascade, and it can
* also be used on properties that are not normally inherited. * also be used on properties that are not normally inherited.
*/ */
for (i = 0; i < shorthand->subproperties->len; i++) return _gtk_css_inherit_value_new ();
{
data[i] = _gtk_css_inherit_value_new ();
}
} }
else if (gtk_css_parser_try_ident (parser, "unset")) else if (gtk_css_parser_try_ident (parser, "unset"))
{ {
@ -103,10 +97,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
* then if it is an inherited property, this is treated as * then if it is an inherited property, this is treated as
* inherit, and if it is not, this is treated as initial. * inherit, and if it is not, this is treated as initial.
*/ */
for (i = 0; i < shorthand->subproperties->len; i++) return _gtk_css_unset_value_new ();
{
data[i] = _gtk_css_unset_value_new ();
}
} }
else if (!shorthand->parse (shorthand, data, parser)) else if (!shorthand->parse (shorthand, data, parser))
{ {