AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

styleproperty: Change order for property registration

Browse Source 
Some properties depend on other properties, handle those first.
This commit is contained in:
Benjamin Otte 2012-01-03 03:37:13 +01:00
parent d021ed7c5e
commit 6dfab12e1b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkcssstylepropertyimpl.c
View File

@ -410,9 +410,10 @@ _gtk_css_style_property_init_properties (void)
GtkCssBackgroundRepeat background_repeat = { GTK_CSS_BACKGROUND_REPEAT_STYLE_REPEAT }; GtkCssBackgroundRepeat background_repeat = { GTK_CSS_BACKGROUND_REPEAT_STYLE_REPEAT };
GtkCssBorderImageRepeat border_image_repeat = { GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_STRETCH }; GtkCssBorderImageRepeat border_image_repeat = { GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_STRETCH };
/* note that gtk_style_properties_register_property() calls this function, /* Initialize "color" and "font-size" first,
* so make sure we're sanely inited to avoid infloops */ * so that when computing values later they are
* done first. That way, 'currentColor' and font
* sizes in em can be looked up properly */
rgba_init (&rgba, 1, 1, 1, 1); rgba_init (&rgba, 1, 1, 1, 1);
gtk_style_property_register ("color", gtk_style_property_register ("color",
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -421,6 +422,16 @@ _gtk_css_style_property_init_properties (void)
NULL, NULL,
NULL, NULL,
&rgba); &rgba);
gtk_style_property_register ("font-size",
G_TYPE_DOUBLE,
GTK_STYLE_PROPERTY_INHERIT,
NULL,
NULL,
NULL,
10.0);
/* properties that aren't referenced when computing values
* start here */
rgba_init (&rgba, 0, 0, 0, 0); rgba_init (&rgba, 0, 0, 0, 0);
gtk_style_property_register ("background-color", gtk_style_property_register ("background-color",
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -459,13 +470,6 @@ _gtk_css_style_property_init_properties (void)
NULL, NULL,
NULL, NULL,
PANGO_WEIGHT_NORMAL); PANGO_WEIGHT_NORMAL);
gtk_style_property_register ("font-size",
G_TYPE_DOUBLE,
GTK_STYLE_PROPERTY_INHERIT,
NULL,
NULL,
NULL,
10.0);
gtk_style_property_register ("text-shadow", gtk_style_property_register ("text-shadow",
GTK_TYPE_SHADOW, GTK_TYPE_SHADOW,