]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcssstylepropertyimpl.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkcssstylepropertyimpl.c
index 341d0b4a31f61361427dfd6b573eeea0b6ed1d4d..26726d73d7a5f7850445699b45dedad96570644d 100644 (file)
 #include "gtkcssarrayvalueprivate.h"
 #include "gtkcssbgsizevalueprivate.h"
 #include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsseasevalueprivate.h"
 #include "gtkcssenginevalueprivate.h"
-#include "gtkcssimagegradientprivate.h"
 #include "gtkcssimageprivate.h"
+#include "gtkcssimagegradientprivate.h"
 #include "gtkcssimagevalueprivate.h"
+#include "gtkcssinitialvalueprivate.h"
 #include "gtkcssenumvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsspositionvalueprivate.h"
@@ -55,7 +57,6 @@
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstringvalueprivate.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtkthemingengine.h"
 #include "gtktypebuiltins.h"
 #include "gtkwin32themeprivate.h"
@@ -64,7 +65,9 @@
 
 typedef enum {
   GTK_STYLE_PROPERTY_INHERIT = (1 << 0),
-  GTK_STYLE_PROPERTY_ANIMATED = (1 << 1)
+  GTK_STYLE_PROPERTY_ANIMATED = (1 << 1),
+  GTK_STYLE_PROPERTY_NO_RESIZE = (1 << 2),
+  GTK_STYLE_PROPERTY_AFFECTS_FONT = (1 << 3)
 } GtkStylePropertyFlags;
 
 static void
@@ -73,8 +76,6 @@ gtk_css_style_property_register (const char *                   name,
                                  GType                          value_type,
                                  GtkStylePropertyFlags          flags,
                                  GtkCssStylePropertyParseFunc   parse_value,
-                                 GtkCssStylePropertyPrintFunc   print_value,
-                                 GtkCssStylePropertyComputeFunc compute_value,
                                  GtkCssStylePropertyQueryFunc   query_value,
                                  GtkCssStylePropertyAssignFunc  assign_value,
                                  GtkCssValue *                  initial_value)
@@ -88,6 +89,8 @@ gtk_css_style_property_register (const char *                   name,
 
   node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY,
                        "value-type", value_type,
+                       "affects-size", (flags & GTK_STYLE_PROPERTY_NO_RESIZE) ? FALSE : TRUE,
+                       "affects-font", (flags & GTK_STYLE_PROPERTY_AFFECTS_FONT) ? TRUE : FALSE,
                        "animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE,
                        "inherit", (flags & GTK_STYLE_PROPERTY_INHERIT) ? TRUE : FALSE,
                        "initial-value", initial_value,
@@ -95,10 +98,6 @@ gtk_css_style_property_register (const char *                   name,
                        NULL);
   
   node->parse_value = parse_value;
-  if (print_value)
-    node->print_value = print_value;
-  if (compute_value)
-    node->compute_value = compute_value;
   node->query_value = query_value;
   node->assign_value = assign_value;
 
@@ -165,7 +164,7 @@ assign_border (GtkCssStyleProperty *property,
   const GtkBorder *border = g_value_get_boxed (value);
 
   if (border == NULL)
-    return _gtk_css_value_ref (_gtk_css_style_property_get_initial_value (property));
+    return _gtk_css_initial_value_new ();
   else
     return _gtk_css_border_value_new (_gtk_css_number_value_new (border->top, GTK_CSS_PX),
                                       _gtk_css_number_value_new (border->right, GTK_CSS_PX),
@@ -177,7 +176,7 @@ static GtkCssValue *
 color_parse (GtkCssStyleProperty *property,
              GtkCssParser        *parser)
 {
-  return _gtk_css_symbolic_value_new (parser);
+  return _gtk_css_color_value_parse (parser);
 }
 
 static void
@@ -228,7 +227,7 @@ static GtkCssValue *
 font_family_parse (GtkCssStyleProperty *property,
                    GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, font_family_parse_one, FALSE);
+  return _gtk_css_array_value_parse (parser, font_family_parse_one);
 }
 
 static void
@@ -400,7 +399,69 @@ static GtkCssValue *
 parse_css_area (GtkCssStyleProperty *property,
                 GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, parse_css_area_one, FALSE);
+  return _gtk_css_array_value_parse (parser, parse_css_area_one);
+}
+
+static GtkCssValue *
+parse_one_css_direction (GtkCssParser *parser)
+{
+  GtkCssValue *value = _gtk_css_direction_value_try_parse (parser);
+  
+  if (value == NULL)
+    _gtk_css_parser_error (parser, "unknown value for property");
+
+  return value;
+}
+
+static GtkCssValue *
+parse_css_direction (GtkCssStyleProperty *property,
+                     GtkCssParser        *parser)
+{
+  return _gtk_css_array_value_parse (parser, parse_one_css_direction);
+}
+
+static GtkCssValue *
+opacity_parse (GtkCssStyleProperty *property,
+              GtkCssParser        *parser)
+{
+  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+}
+
+
+static GtkCssValue *
+parse_one_css_play_state (GtkCssParser *parser)
+{
+  GtkCssValue *value = _gtk_css_play_state_value_try_parse (parser);
+  
+  if (value == NULL)
+    _gtk_css_parser_error (parser, "unknown value for property");
+
+  return value;
+}
+
+static GtkCssValue *
+parse_css_play_state (GtkCssStyleProperty *property,
+                      GtkCssParser        *parser)
+{
+  return _gtk_css_array_value_parse (parser, parse_one_css_play_state);
+}
+
+static GtkCssValue *
+parse_one_css_fill_mode (GtkCssParser *parser)
+{
+  GtkCssValue *value = _gtk_css_fill_mode_value_try_parse (parser);
+  
+  if (value == NULL)
+    _gtk_css_parser_error (parser, "unknown value for property");
+
+  return value;
+}
+
+static GtkCssValue *
+parse_css_fill_mode (GtkCssStyleProperty *property,
+                     GtkCssParser        *parser)
+{
+  return _gtk_css_array_value_parse (parser, parse_one_css_fill_mode);
 }
 
 static GtkCssValue *
@@ -415,8 +476,11 @@ bindings_value_parse_one (GtkCssParser *parser)
       return NULL;
     }
 
-
-  if (!gtk_binding_set_find (name))
+  if (g_ascii_strcasecmp (name, "none"))
+    {
+      name = NULL;
+    }
+  else if (!gtk_binding_set_find (name))
     {
       _gtk_css_parser_error (parser, "No binding set named '%s'", name);
       g_free (name);
@@ -430,7 +494,7 @@ static GtkCssValue *
 bindings_value_parse (GtkCssStyleProperty *property,
                       GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, bindings_value_parse_one, TRUE);
+  return _gtk_css_array_value_parse (parser, bindings_value_parse_one);
 }
 
 static void
@@ -446,12 +510,23 @@ bindings_value_query (GtkCssStyleProperty *property,
   if (_gtk_css_array_value_get_n_values (css_value) == 0)
     return;
 
-  array = g_ptr_array_new ();
+  array = NULL;
 
   for (i = 0; i < _gtk_css_array_value_get_n_values (css_value); i++)
     {
-      GtkBindingSet *binding_set = gtk_binding_set_find (_gtk_css_string_value_get (_gtk_css_array_value_get_nth (css_value, i)));
-
+      const char *name;
+      GtkBindingSet *binding_set;
+      
+      name = _gtk_css_string_value_get (_gtk_css_array_value_get_nth (css_value, i));
+      if (name == NULL)
+        continue;
+
+      binding_set = gtk_binding_set_find (name);
+      if (binding_set == NULL)
+        continue;
+      
+      if (array == NULL)
+        array = g_ptr_array_new ();
       g_ptr_array_add (array, binding_set);
     }
 
@@ -467,7 +542,7 @@ bindings_value_assign (GtkCssStyleProperty *property,
   guint i;
 
   if (binding_sets == NULL || binding_sets->len == 0)
-    return _gtk_css_array_value_new (NULL);
+    return _gtk_css_array_value_new (_gtk_css_string_value_new (NULL));
 
   values = g_new (GtkCssValue *, binding_sets->len);
 
@@ -561,7 +636,7 @@ static GtkCssValue *
 background_image_value_parse (GtkCssStyleProperty *property,
                               GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, background_image_value_parse_one, FALSE);
+  return _gtk_css_array_value_parse (parser, background_image_value_parse_one);
 }
 
 static void
@@ -583,15 +658,17 @@ static GtkCssValue *
 font_size_parse (GtkCssStyleProperty *property,
                  GtkCssParser        *parser)
 {
-  gdouble d;
+  GtkCssValue *value;
 
-  if (!_gtk_css_parser_try_double (parser, &d))
-    {
-      _gtk_css_parser_error (parser, "Expected a number");
-      return NULL;
-    }
+  value = _gtk_css_font_size_value_try_parse (parser);
+  if (value)
+    return value;
 
-  return _gtk_css_number_value_new (d, GTK_CSS_PX);
+  return _gtk_css_number_value_parse (parser,
+                                      GTK_CSS_PARSE_LENGTH
+                                      | GTK_CSS_PARSE_PERCENT
+                                      | GTK_CSS_POSITIVE_ONLY
+                                      | GTK_CSS_NUMBER_AS_PIXELS);
 }
 
 static GtkCssValue *
@@ -663,7 +740,7 @@ static GtkCssValue *
 transition_property_parse (GtkCssStyleProperty *property,
                            GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, transition_property_parse_one, FALSE);
+  return _gtk_css_array_value_parse (parser, transition_property_parse_one);
 }
 
 static GtkCssValue *
@@ -676,14 +753,30 @@ static GtkCssValue *
 transition_time_parse (GtkCssStyleProperty *property,
                        GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, transition_time_parse_one, FALSE);
+  return _gtk_css_array_value_parse (parser, transition_time_parse_one);
 }
 
 static GtkCssValue *
 transition_timing_function_parse (GtkCssStyleProperty *property,
                                   GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, _gtk_css_ease_value_parse, FALSE);
+  return _gtk_css_array_value_parse (parser, _gtk_css_ease_value_parse);
+}
+
+static GtkCssValue *
+iteration_count_parse_one (GtkCssParser *parser)
+{
+  if (_gtk_css_parser_try (parser, "infinite", TRUE))
+    return _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
+
+  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY);
+}
+
+static GtkCssValue *
+iteration_count_parse (GtkCssStyleProperty *property,
+                       GtkCssParser        *parser)
+{
+  return _gtk_css_array_value_parse (parser, iteration_count_parse_one);
 }
 
 static GtkCssValue *
@@ -756,36 +849,25 @@ static GtkCssValue *
 background_repeat_value_parse (GtkCssStyleProperty *property,
                                GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, background_repeat_value_parse_one, FALSE);
+  return _gtk_css_array_value_parse (parser, background_repeat_value_parse_one);
 }
 
 static GtkCssValue *
 background_size_parse (GtkCssStyleProperty *property,
                        GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, _gtk_css_bg_size_value_parse, FALSE);
+  return _gtk_css_array_value_parse (parser, _gtk_css_bg_size_value_parse);
 }
 
 static GtkCssValue *
 background_position_parse (GtkCssStyleProperty *property,
                           GtkCssParser        *parser)
 {
-  return _gtk_css_array_value_parse (parser, _gtk_css_position_value_parse, FALSE);
+  return _gtk_css_array_value_parse (parser, _gtk_css_position_value_parse);
 }
 
 /*** REGISTRATION ***/
 
-static GtkSymbolicColor *
-gtk_symbolic_color_new_rgba (double red,
-                             double green,
-                             double blue,
-                             double alpha)
-{
-  GdkRGBA rgba = { red, green, blue, alpha };
-
-  return gtk_symbolic_color_new_literal (&rgba);
-}
-
 void
 _gtk_css_style_property_init_properties (void)
 {
@@ -796,77 +878,60 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("color",
                                           GTK_CSS_PROPERTY_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
+                                          _gtk_css_color_value_new_rgba (1, 1, 1, 1));
   gtk_css_style_property_register        ("font-size",
                                           GTK_CSS_PROPERTY_FONT_SIZE,
                                           G_TYPE_DOUBLE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_AFFECTS_FONT,
                                           font_size_parse,
-                                          NULL,
-                                          NULL,
                                           query_length_as_double,
                                           assign_length_from_double,
-                                          /* XXX: This should be 'normal' */
-                                          _gtk_css_number_value_new (10.0, GTK_CSS_PX));
+                                          _gtk_css_font_size_value_new (GTK_CSS_FONT_SIZE_MEDIUM));
 
   /* properties that aren't referenced when computing values
    * start here */
   gtk_css_style_property_register        ("background-color",
                                           GTK_CSS_PROPERTY_BACKGROUND_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
+                                          _gtk_css_color_value_new_rgba (0, 0, 0, 0));
 
   gtk_css_style_property_register        ("font-family",
                                           GTK_CSS_PROPERTY_FONT_FAMILY,
                                           G_TYPE_STRV,
-                                          GTK_STYLE_PROPERTY_INHERIT,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT,
                                           font_family_parse,
-                                          NULL,
-                                          NULL,
                                           font_family_query,
                                           font_family_assign,
                                           _gtk_css_array_value_new (_gtk_css_string_value_new ("Sans")));
   gtk_css_style_property_register        ("font-style",
                                           GTK_CSS_PROPERTY_FONT_STYLE,
                                           PANGO_TYPE_STYLE,
-                                          GTK_STYLE_PROPERTY_INHERIT,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT,
                                           parse_pango_style,
-                                          NULL,
-                                          NULL,
                                           query_pango_style,
                                           assign_pango_style,
                                           _gtk_css_font_style_value_new (PANGO_STYLE_NORMAL));
   gtk_css_style_property_register        ("font-variant",
                                           GTK_CSS_PROPERTY_FONT_VARIANT,
                                           PANGO_TYPE_VARIANT,
-                                          GTK_STYLE_PROPERTY_INHERIT,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT,
                                           parse_pango_variant,
-                                          NULL,
-                                          NULL,
                                           query_pango_variant,
                                           assign_pango_variant,
                                           _gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL));
   gtk_css_style_property_register        ("font-weight",
                                           GTK_CSS_PROPERTY_FONT_WEIGHT,
                                           PANGO_TYPE_WEIGHT,
-                                          GTK_STYLE_PROPERTY_INHERIT,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT,
                                           parse_pango_weight,
-                                          NULL,
-                                          NULL,
                                           query_pango_weight,
                                           assign_pango_weight,
                                           _gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL));
@@ -874,34 +939,28 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("text-shadow",
                                           GTK_CSS_PROPERTY_TEXT_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_shadows_value_new_none ());
 
   gtk_css_style_property_register        ("icon-shadow",
                                           GTK_CSS_PROPERTY_ICON_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_shadows_value_new_none ());
 
   gtk_css_style_property_register        ("box-shadow",
                                           GTK_CSS_PROPERTY_BOX_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_shadows_value_new_none ());
 
   gtk_css_style_property_register        ("margin-top",
@@ -909,8 +968,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_margin,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -919,8 +976,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_margin,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -929,8 +984,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_margin,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -939,8 +992,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_margin,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -949,8 +1000,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_padding,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -959,8 +1008,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_padding,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -969,8 +1016,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_padding,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -979,8 +1024,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_padding,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -990,10 +1033,8 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-style",
                                           GTK_CSS_PROPERTY_BORDER_TOP_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_border_style,
-                                          NULL,
-                                          NULL,
                                           query_border_style,
                                           assign_border_style,
                                           _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
@@ -1002,18 +1043,14 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_border_width,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-left-style",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_border_style,
-                                          NULL,
-                                          NULL,
                                           query_border_style,
                                           assign_border_style,
                                           _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
@@ -1022,18 +1059,14 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_border_width,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-bottom-style",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_border_style,
-                                          NULL,
-                                          NULL,
                                           query_border_style,
                                           assign_border_style,
                                           _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
@@ -1042,18 +1075,14 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_border_width,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-right-style",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_border_style,
-                                          NULL,
-                                          NULL,
                                           query_border_style,
                                           assign_border_style,
                                           _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
@@ -1062,8 +1091,6 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_border_width,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -1071,55 +1098,45 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
                                                                      _gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-top-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
                                                                      _gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-bottom-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
                                                                      _gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-bottom-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
                                                                      _gtk_css_number_value_new (0, GTK_CSS_PX)));
 
   gtk_css_style_property_register        ("outline-style",
                                           GTK_CSS_PROPERTY_OUTLINE_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_border_style,
-                                          NULL,
-                                          NULL,
                                           query_border_style,
                                           assign_border_style,
                                           _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
@@ -1128,18 +1145,14 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_INT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           parse_border_width,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("outline-offset",
                                           GTK_CSS_PROPERTY_OUTLINE_OFFSET,
                                           G_TYPE_INT,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           outline_parse,
-                                          NULL,
-                                          NULL,
                                           query_length_as_int,
                                           assign_length_from_int,
                                           _gtk_css_number_value_new (0.0, GTK_CSS_PX));
@@ -1147,124 +1160,92 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-clip",
                                           GTK_CSS_PROPERTY_BACKGROUND_CLIP,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_css_area,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX)));
   gtk_css_style_property_register        ("background-origin",
                                           GTK_CSS_PROPERTY_BACKGROUND_ORIGIN,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           parse_css_area,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX)));
   gtk_css_style_property_register        ("background-size",
                                           GTK_CSS_PROPERTY_BACKGROUND_SIZE,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           background_size_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_bg_size_value_new (NULL, NULL)));
   gtk_css_style_property_register        ("background-position",
                                           GTK_CSS_PROPERTY_BACKGROUND_POSITION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           background_position_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PERCENT),
                                                                                                  _gtk_css_number_value_new (0, GTK_CSS_PERCENT))));
 
   gtk_css_style_property_register        ("border-top-color",
                                           GTK_CSS_PROPERTY_BORDER_TOP_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-right-color",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-bottom-color",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-left-color",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("outline-color",
                                           GTK_CSS_PROPERTY_OUTLINE_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           color_parse,
-                                          NULL,
-                                          NULL,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
 
   gtk_css_style_property_register        ("background-repeat",
                                           GTK_CSS_PROPERTY_BACKGROUND_REPEAT,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           background_repeat_value_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_background_repeat_value_new (GTK_CSS_REPEAT_STYLE_REPEAT,
                                                                                                           GTK_CSS_REPEAT_STYLE_REPEAT)));
   gtk_css_style_property_register        ("background-image",
                                           GTK_CSS_PROPERTY_BACKGROUND_IMAGE,
                                           CAIRO_GOBJECT_TYPE_PATTERN,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           background_image_value_parse,
-                                          NULL,
-                                          NULL,
                                           background_image_value_query,
                                           background_image_value_assign,
                                           _gtk_css_array_value_new (_gtk_css_image_value_new (NULL)));
@@ -1272,32 +1253,26 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-source",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE,
                                           CAIRO_GOBJECT_TYPE_PATTERN,
-                                          GTK_STYLE_PROPERTY_ANIMATED,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
                                           css_image_value_parse,
-                                          NULL,
-                                          NULL,
                                           css_image_value_query,
                                           css_image_value_assign,
                                           _gtk_css_image_value_new (NULL));
   gtk_css_style_property_register        ("border-image-repeat",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_image_repeat_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_border_repeat_value_new (GTK_CSS_REPEAT_STYLE_STRETCH,
                                                                             GTK_CSS_REPEAT_STYLE_STRETCH));
 
   gtk_css_style_property_register        ("border-image-slice",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE,
                                           GTK_TYPE_BORDER,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_image_slice_parse,
-                                          NULL,
-                                          NULL,
                                           query_border,
                                           assign_border,
                                           _gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
@@ -1307,10 +1282,8 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-width",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH,
                                           GTK_TYPE_BORDER,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           border_image_width_parse,
-                                          NULL,
-                                          NULL,
                                           query_border,
                                           assign_border,
                                           _gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
@@ -1321,52 +1294,116 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("transition-property",
                                           GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           transition_property_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_ident_value_new ("all")));
   gtk_css_style_property_register        ("transition-duration",
                                           GTK_CSS_PROPERTY_TRANSITION_DURATION,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
   gtk_css_style_property_register        ("transition-timing-function",
                                           GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           transition_timing_function_parse,
                                           NULL,
                                           NULL,
-                                          NULL,
-                                          NULL,
                                           _gtk_css_array_value_new (
                                             _gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 1.0)));
   gtk_css_style_property_register        ("transition-delay",
                                           GTK_CSS_PROPERTY_TRANSITION_DELAY,
                                           G_TYPE_NONE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
+                                          _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
+
+  gtk_css_style_property_register        ("animation-name",
+                                          GTK_CSS_PROPERTY_ANIMATION_NAME,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          transition_property_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_ident_value_new ("none")));
+  gtk_css_style_property_register        ("animation-duration",
+                                          GTK_CSS_PROPERTY_ANIMATION_DURATION,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          transition_time_parse,
                                           NULL,
                                           NULL,
                                           _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
+  gtk_css_style_property_register        ("animation-timing-function",
+                                          GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          transition_timing_function_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (
+                                            _gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 1.0)));
+  gtk_css_style_property_register        ("animation-iteration-count",
+                                          GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          iteration_count_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER)));
+  gtk_css_style_property_register        ("animation-direction",
+                                          GTK_CSS_PROPERTY_ANIMATION_DIRECTION,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          parse_css_direction,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_direction_value_new (GTK_CSS_DIRECTION_NORMAL)));
+  gtk_css_style_property_register        ("animation-play-state",
+                                          GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          parse_css_play_state,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_play_state_value_new (GTK_CSS_PLAY_STATE_RUNNING)));
+  gtk_css_style_property_register        ("animation-delay",
+                                          GTK_CSS_PROPERTY_ANIMATION_DELAY,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          transition_time_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
+  gtk_css_style_property_register        ("animation-fill-mode",
+                                          GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          parse_css_fill_mode,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_array_value_new (_gtk_css_fill_mode_value_new (GTK_CSS_FILL_NONE)));
+  gtk_css_style_property_register        ("opacity",
+                                          GTK_CSS_PROPERTY_OPACITY,
+                                          G_TYPE_NONE,
+                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          opacity_parse,
+                                          NULL,
+                                          NULL,
+                                          _gtk_css_number_value_new (1, GTK_CSS_NUMBER));
 
   gtk_css_style_property_register        ("engine",
                                           GTK_CSS_PROPERTY_ENGINE,
                                           GTK_TYPE_THEMING_ENGINE,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           engine_parse,
-                                          NULL,
-                                          NULL,
                                           engine_query,
                                           engine_assign,
                                           _gtk_css_engine_value_new (gtk_theming_engine_load (NULL)));
@@ -1375,12 +1412,10 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("gtk-key-bindings",
                                           GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,
                                           G_TYPE_PTR_ARRAY,
-                                          0,
+                                          GTK_STYLE_PROPERTY_NO_RESIZE,
                                           bindings_value_parse,
-                                          NULL,
-                                          NULL,
                                           bindings_value_query,
                                           bindings_value_assign,
-                                          _gtk_css_array_value_new (NULL));
+                                          _gtk_css_array_value_new (_gtk_css_string_value_new (NULL)));
 }