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

styleproperty: Add custom 'none' handling

Browse Source 
The generic 'none' handling needs to go, because 'none' is not a valid
value most of the time.
This commit is contained in:
Benjamin Otte 2011-12-30 12:44:16 +01:00
parent 78024504aa
commit c77dba2767
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkstyleproperty.c
View File

@ -557,6 +557,12 @@ theming_engine_value_parse (GtkCssParser *parser,
GtkThemingEngine *engine; GtkThemingEngine *engine;
char *str; char *str;
if (_gtk_css_parser_try (parser, "none", TRUE))
{
g_value_set_object (value, gtk_theming_engine_load (NULL));
return TRUE;
}
str = _gtk_css_parser_try_ident (parser, TRUE); str = _gtk_css_parser_try_ident (parser, TRUE);
if (str == NULL) if (str == NULL)
{ {
@ -565,6 +571,7 @@ theming_engine_value_parse (GtkCssParser *parser,
} }
engine = gtk_theming_engine_load (str); engine = gtk_theming_engine_load (str);
if (engine == NULL) if (engine == NULL)
{ {
_gtk_css_parser_error (parser, "Themeing engine '%s' not found", str); _gtk_css_parser_error (parser, "Themeing engine '%s' not found", str);
@ -976,7 +983,11 @@ pattern_value_parse (GtkCssParser *parser,
GFile *base, GFile *base,
GValue *value) GValue *value)
{ {
if (_gtk_css_parser_begins_with (parser, '-')) if (_gtk_css_parser_try (parser, "none", TRUE))
{
/* nothing to do here */
}
else if (_gtk_css_parser_begins_with (parser, '-'))
{ {
int res; int res;
res = _gtk_win32_theme_part_parse (parser, base, value); res = _gtk_win32_theme_part_parse (parser, base, value);
@ -1115,6 +1126,9 @@ shadow_value_parse (GtkCssParser *parser,
shadow = _gtk_shadow_new (); shadow = _gtk_shadow_new ();
if (_gtk_css_parser_try (parser, "none", TRUE))
return TRUE;
do do
{ {
have_inset = have_lengths = have_color = FALSE; have_inset = have_lengths = have_color = FALSE;
@ -1290,6 +1304,9 @@ border_image_value_parse (GtkCssParser *parser,
gboolean retval = FALSE; gboolean retval = FALSE;
GtkBorderImage *image = NULL; GtkBorderImage *image = NULL;
if (_gtk_css_parser_try (parser, "none", TRUE))
return TRUE;
g_value_init (&temp, CAIRO_GOBJECT_TYPE_PATTERN); g_value_init (&temp, CAIRO_GOBJECT_TYPE_PATTERN);
if (!pattern_value_parse (parser, base, &temp)) if (!pattern_value_parse (parser, base, &temp))