AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

css: Remove generic 'none' handling

Browse Source 
Includes updated tests.
Who could have thought that our tests were broken. Ooops.
This commit is contained in:
Benjamin Otte 2011-12-30 12:51:03 +01:00
parent 7d353fbccf
commit 6fdf6ba68f
7 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkstyleproperty.c
View File

@ -2366,14 +2366,6 @@ _gtk_style_property_parse_value (const GtkStyleProperty *property,
g_value_set_enum (value, GTK_CSS_INHERIT);
return TRUE;
}
else if (_gtk_css_parser_try (parser, "none", TRUE))
{
/* Insert the default value, so it has an opportunity
* to override other style providers when merged
*/
g_param_value_set_default (property->pspec, value);
return TRUE;
}
else if (property->property_parse_func)
{
GError *error = NULL;

16
tests/css/parser/border-radius.css
View File

@ -31,34 +31,30 @@ h {
}
i {
border-radius: none;
}
j {
border-radius: 1.125 / 5.5;
}
k {
j {
border-radius: 1 2.25 / 5;
}
l {
k {
border-radius: 1 2 3.5 / 5.5 6.75;
}
m {
l {
border-radius: 0 / 0;
}
n {
m {
border-radius: 0;
}
o {
n {
border-radius: 0 / 1;
}
p {
o {
border-radius: 1 / 0;
}

2
tests/css/parser/border-radius.errors
View File

@ -1,3 +1,4 @@
border-radius.css:64: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:68: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:72: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:76: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
@ -10,4 +11,3 @@ border-radius.css:100: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:104: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:108: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:112: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius.css:116: error: GTK_CSS_PROVIDER_ERROR_SYNTAX

27
tests/css/parser/border-radius.ref.css
View File

@ -55,33 +55,33 @@ h {
}
i {
border-bottom-left-radius: none;
border-bottom-right-radius: none;
border-top-left-radius: none;
border-top-right-radius: none;
}
j {
border-bottom-left-radius: 1.125 5.5;
border-bottom-right-radius: 1.125 5.5;
border-top-left-radius: 1.125 5.5;
border-top-right-radius: 1.125 5.5;
}
k {
j {
border-bottom-left-radius: 2.25 5;
border-bottom-right-radius: 1 5;
border-top-left-radius: 1 5;
border-top-right-radius: 2.25 5;
}
l {
k {
border-bottom-left-radius: 2 6.75;
border-bottom-right-radius: 3.5 5.5;
border-top-left-radius: 1 5.5;
border-top-right-radius: 2 6.75;
}
l {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
m {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@ -90,20 +90,13 @@ m {
}
n {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
o {
border-bottom-left-radius: 0 1;
border-bottom-right-radius: 0 1;
border-top-left-radius: 0 1;
border-top-right-radius: 0 1;
}
p {
o {
border-bottom-left-radius: 1 0;
border-bottom-right-radius: 1 0;
border-top-left-radius: 1 0;

4
tests/css/parser/border.css
View File

@ -53,7 +53,3 @@ m {
n {
border-property: 1 2 ; 4;
}
o {
border-property: none
}

4
tests/css/parser/border.ref.css
View File

@ -25,7 +25,3 @@ f {
n {
border-property: 1 2;
}
o {
border-property: none;
}

2
tests/css/parser/font-family.ref.css
View File

@ -1,5 +1,5 @@
a {
font-family: none;
font-family: "none";
}
b {