#include "fallback-c89.c"
/* the actual parsers we have */
-#include "gtkanimationdescription.h"
#include "gtkbindings.h"
#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"
#include "gtkcssrgbavalueprivate.h"
#include "gtkcssshadowsvalueprivate.h"
#include "gtkcssstringvalueprivate.h"
-#include "gtksymboliccolorprivate.h"
#include "gtkthemingengine.h"
#include "gtktypebuiltins.h"
#include "gtkwin32themeprivate.h"
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
GType value_type,
GtkStylePropertyFlags flags,
GtkCssStylePropertyParseFunc parse_value,
- GtkCssStylePropertyPrintFunc print_value,
- GtkCssStylePropertyComputeFunc compute_value,
GtkCssStylePropertyQueryFunc query_value,
GtkCssStylePropertyAssignFunc assign_value,
- GtkCssStylePropertyEqualFunc equal_func,
GtkCssValue * initial_value)
{
GtkCssStyleProperty *node;
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,
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;
- if (equal_func)
- node->equal_func = equal_func;
_gtk_css_value_unref (initial_value);
/*** IMPLEMENTATIONS ***/
-static void
-query_simple (GtkCssStyleProperty *property,
- const GtkCssValue *css_value,
- GValue *value)
-{
- _gtk_css_value_init_gvalue (css_value, value);
-}
-
-static GtkCssValue *
-assign_simple (GtkCssStyleProperty *property,
- const GValue *value)
-{
- return _gtk_css_value_new_from_gvalue (value);
-}
-
static void
query_length_as_int (GtkCssStyleProperty *property,
const GtkCssValue *css_value,
return _gtk_css_number_value_new (g_value_get_double (value), GTK_CSS_PX);
}
-static GtkCssValue *
-color_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+static void
+query_border (GtkCssStyleProperty *property,
+ const GtkCssValue *css_value,
+ GValue *value)
{
- GtkSymbolicColor *symbolic;
+ GtkBorder border;
- if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
- {
- symbolic = gtk_symbolic_color_ref (_gtk_symbolic_color_get_current_color ());
- }
- else
- {
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
- return NULL;
- }
+ g_value_init (value, GTK_TYPE_BORDER);
+
+ border.top = round (_gtk_css_number_value_get (_gtk_css_border_value_get_top (css_value), 100));
+ border.right = round (_gtk_css_number_value_get (_gtk_css_border_value_get_right (css_value), 100));
+ border.bottom = round (_gtk_css_number_value_get (_gtk_css_border_value_get_bottom (css_value), 100));
+ border.left = round (_gtk_css_number_value_get (_gtk_css_border_value_get_left (css_value), 100));
- return _gtk_css_value_new_take_symbolic_color (symbolic);
+ g_value_set_boxed (value, &border);
}
static GtkCssValue *
-color_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
+assign_border (GtkCssStyleProperty *property,
+ const GValue *value)
{
- return _gtk_css_rgba_value_compute_from_symbolic (specified,
- _gtk_css_style_property_get_initial_value (property),
- context,
- FALSE);
+ const GtkBorder *border = g_value_get_boxed (value);
+
+ if (border == NULL)
+ 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),
+ _gtk_css_number_value_new (border->bottom, GTK_CSS_PX),
+ _gtk_css_number_value_new (border->left, GTK_CSS_PX));
}
static GtkCssValue *
-color_property_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
+color_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
- GtkCssValue *value;
-
- value = _gtk_css_rgba_value_compute_from_symbolic (specified,
- _gtk_css_style_property_get_initial_value (property),
- context,
- TRUE);
- _gtk_css_rgba_value_get_rgba (value);
- return value;
+ return _gtk_css_color_value_parse (parser);
}
static void
static GtkCssValue *
font_family_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ 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
static GtkCssValue *
parse_pango_style (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_font_style_value_try_parse (parser);
static GtkCssValue *
parse_pango_weight (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_font_weight_value_try_parse (parser);
static GtkCssValue *
parse_pango_variant (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_font_variant_value_try_parse (parser);
static GtkCssValue *
parse_border_style (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_border_style_value_try_parse (parser);
}
static GtkCssValue *
-parse_css_area (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+parse_css_area_one (GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_area_value_try_parse (parser);
return value;
}
+static GtkCssValue *
+parse_css_area (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
+{
+ 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 *
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);
static GtkCssValue *
bindings_value_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ 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
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);
}
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);
static GtkCssValue *
shadow_value_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_shadows_value_parse (parser);
}
-static GtkCssValue *
-shadow_value_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- return _gtk_css_shadows_value_compute (specified, context);
-}
-
static GtkCssValue *
border_corner_radius_value_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_corner_value_parse (parser);
}
-static GtkCssValue *
-border_corner_radius_value_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- return _gtk_css_corner_value_compute (specified, context);
-}
-
static GtkCssValue *
css_image_value_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImage *image;
image = NULL;
else
{
- image = _gtk_css_image_new_parse (parser, base);
+ image = _gtk_css_image_new_parse (parser);
if (image == NULL)
return FALSE;
}
return _gtk_css_image_value_new (image);
}
-static GtkCssValue *
-css_image_value_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- GtkCssImage *image, *computed;
-
- image = _gtk_css_image_value_get_image (specified);
-
- if (image == NULL)
- return _gtk_css_value_ref (specified);
-
- computed = _gtk_css_image_compute (image, context);
-
- if (computed == image)
- {
- g_object_unref (computed);
- return _gtk_css_value_ref (specified);
- }
-
- return _gtk_css_image_value_new (computed);
-}
-
static void
css_image_value_query (GtkCssStyleProperty *property,
const GtkCssValue *css_value,
}
static GtkCssValue *
-font_size_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+background_image_value_parse_one (GtkCssParser *parser)
{
- gdouble d;
+ return css_image_value_parse (NULL, parser);
+}
- if (!_gtk_css_parser_try_double (parser, &d))
- {
- _gtk_css_parser_error (parser, "Expected a number");
- return NULL;
- }
+static GtkCssValue *
+background_image_value_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
+{
+ return _gtk_css_array_value_parse (parser, background_image_value_parse_one);
+}
- return _gtk_css_number_value_new (d, GTK_CSS_PX);
+static void
+background_image_value_query (GtkCssStyleProperty *property,
+ const GtkCssValue *css_value,
+ GValue *value)
+{
+ css_image_value_query (property, _gtk_css_array_value_get_nth (css_value, 0), value);
}
static GtkCssValue *
-font_size_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
+background_image_value_assign (GtkCssStyleProperty *property,
+ const GValue *value)
{
- return _gtk_css_number_value_compute (specified, context);
+ return _gtk_css_array_value_new (css_image_value_assign (property, value));
}
static GtkCssValue *
-outline_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+font_size_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
+ GtkCssValue *value;
+
+ value = _gtk_css_font_size_value_try_parse (parser);
+ if (value)
+ return value;
+
return _gtk_css_number_value_parse (parser,
- GTK_CSS_NUMBER_AS_PIXELS
- | GTK_CSS_PARSE_LENGTH);
+ GTK_CSS_PARSE_LENGTH
+ | GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_POSITIVE_ONLY
+ | GTK_CSS_NUMBER_AS_PIXELS);
}
static GtkCssValue *
-outline_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
+outline_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
- return _gtk_css_number_value_compute (specified, context);
+ return _gtk_css_number_value_parse (parser,
+ GTK_CSS_NUMBER_AS_PIXELS
+ | GTK_CSS_PARSE_LENGTH);
}
static GtkCssValue *
border_image_repeat_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_border_repeat_value_try_parse (parser);
static GtkCssValue *
border_image_slice_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GValue value = G_VALUE_INIT;
- GtkCssValue *result;
-
- g_value_init (&value, GTK_TYPE_BORDER);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- {
- g_value_unset (&value);
- return NULL;
- }
-
- result = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
-
- return result;
+ return _gtk_css_border_value_parse (parser,
+ GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_PARSE_NUMBER
+ | GTK_CSS_POSITIVE_ONLY,
+ FALSE,
+ TRUE);
}
static GtkCssValue *
border_image_width_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GValue value = G_VALUE_INIT;
- GtkCssValue *result;
-
- g_value_init (&value, GTK_TYPE_BORDER);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- {
- g_value_unset (&value);
- return NULL;
- }
-
- result = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
-
- return result;
+ return _gtk_css_border_value_parse (parser,
+ GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_PARSE_LENGTH
+ | GTK_CSS_PARSE_NUMBER
+ | GTK_CSS_POSITIVE_ONLY,
+ TRUE,
+ FALSE);
}
static GtkCssValue *
static GtkCssValue *
transition_property_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ 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 *
static GtkCssValue *
transition_time_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ 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,
- GFile *base)
+ GtkCssParser *parser)
+{
+ return _gtk_css_array_value_parse (parser, _gtk_css_ease_value_parse);
+}
+
+static GtkCssValue *
+iteration_count_parse_one (GtkCssParser *parser)
{
- return _gtk_css_array_value_parse (parser, _gtk_css_ease_value_parse, FALSE);
+ 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 *
engine_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_engine_value_parse (parser);
}
return _gtk_css_engine_value_new (g_value_get_object (value));
}
-static GtkCssValue *
-transition_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
-{
- GValue value = G_VALUE_INIT;
- GtkCssValue *result;
-
- g_value_init (&value, GTK_TYPE_ANIMATION_DESCRIPTION);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- {
- g_value_unset (&value);
- return NULL;
- }
-
- result = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
-
- return result;
-}
-
static GtkCssValue *
parse_margin (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
}
-static GtkCssValue *
-compute_margin (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- return _gtk_css_number_value_compute (specified, context);
-}
-
static GtkCssValue *
parse_padding (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_PARSE_LENGTH);
}
-static GtkCssValue *
-compute_padding (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- return _gtk_css_number_value_compute (specified, context);
-}
-
static GtkCssValue *
parse_border_width (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
}
static GtkCssValue *
-compute_border_width (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- GtkBorderStyle border_style;
-
- /* The -1 is magic that is only true because we register the style
- * properties directly after the width properties.
- */
- border_style = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, _gtk_css_style_property_get_id (property) - 1));
-
- if (border_style == GTK_BORDER_STYLE_NONE ||
- border_style == GTK_BORDER_STYLE_HIDDEN)
- return _gtk_css_number_value_new (0, GTK_CSS_PX);
- else
- return _gtk_css_number_value_compute (specified, context);
-}
-
-static GtkCssValue *
-background_repeat_value_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+background_repeat_value_parse_one (GtkCssParser *parser)
{
GtkCssValue *value = _gtk_css_background_repeat_value_try_parse (parser);
}
static GtkCssValue *
-background_size_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
-{
- GtkCssBackgroundSize size = { GTK_CSS_NUMBER_INIT (0, GTK_CSS_PX), GTK_CSS_NUMBER_INIT (0, GTK_CSS_PX), FALSE, FALSE};
-
- if (_gtk_css_parser_try (parser, "cover", TRUE))
- size.cover = TRUE;
- else if (_gtk_css_parser_try (parser, "contain", TRUE))
- size.contain = TRUE;
- else
- {
- if (_gtk_css_parser_try (parser, "auto", TRUE))
- _gtk_css_number_init (&size.width, 0, GTK_CSS_PX);
- else if (!_gtk_css_parser_read_number (parser,
- &size.width,
- GTK_CSS_POSITIVE_ONLY
- | GTK_CSS_PARSE_PERCENT
- | GTK_CSS_PARSE_LENGTH))
- return NULL;
-
- if (_gtk_css_parser_try (parser, "auto", TRUE))
- _gtk_css_number_init (&size.height, 0, GTK_CSS_PX);
- else if (_gtk_css_parser_has_number (parser))
- {
- if (!_gtk_css_parser_read_number (parser,
- &size.height,
- GTK_CSS_POSITIVE_ONLY
- | GTK_CSS_PARSE_PERCENT
- | GTK_CSS_PARSE_LENGTH))
- return NULL;
- }
- else
- _gtk_css_number_init (&size.height, 0, GTK_CSS_PX);
- }
-
- return _gtk_css_value_new_from_background_size (&size);
-}
-
-static void
-background_size_print (GtkCssStyleProperty *property,
- const GtkCssValue *value,
- GString *string)
+background_repeat_value_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
- const GtkCssBackgroundSize *size = _gtk_css_value_get_background_size (value);
-
- if (size->cover)
- g_string_append (string, "cover");
- else if (size->contain)
- g_string_append (string, "contain");
- else
- {
- if (size->width.value == 0)
- g_string_append (string, "auto");
- else
- _gtk_css_number_print (&size->width, string);
-
- if (size->height.value != 0)
- {
- g_string_append (string, " ");
- _gtk_css_number_print (&size->height, string);
- }
- }
+ return _gtk_css_array_value_parse (parser, background_repeat_value_parse_one);
}
static GtkCssValue *
-background_size_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
-{
- const GtkCssBackgroundSize *ssize = _gtk_css_value_get_background_size (specified);
- GtkCssBackgroundSize csize;
- gboolean changed;
-
- csize.cover = ssize->cover;
- csize.contain = ssize->contain;
- changed = _gtk_css_number_compute (&csize.width,
- &ssize->width,
- context);
- changed |= _gtk_css_number_compute (&csize.height,
- &ssize->height,
- context);
- if (changed)
- return _gtk_css_value_new_from_background_size (&csize);
- return _gtk_css_value_ref (specified);
-}
-
-static GtkCssValue *
-background_position_parse (GtkCssStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+background_size_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
- return _gtk_css_position_value_parse (parser);
+ return _gtk_css_array_value_parse (parser, _gtk_css_bg_size_value_parse);
}
static GtkCssValue *
-background_position_compute (GtkCssStyleProperty *property,
- GtkStyleContext *context,
- GtkCssValue *specified)
+background_position_parse (GtkCssStyleProperty *property,
+ GtkCssParser *parser)
{
- return _gtk_css_position_value_compute (specified, context);
+ 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)
{
- GtkCssBackgroundSize default_background_size = { GTK_CSS_NUMBER_INIT (0, GTK_CSS_PX), GTK_CSS_NUMBER_INIT (0, GTK_CSS_PX), FALSE, FALSE };
- GtkBorder border_of_ones = { 1, 1, 1, 1 };
-
/* Initialize "color" and "font-size" first,
* so that when computing values later they are
* done first. That way, 'currentColor' and font
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,
- color_property_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- font_size_compute,
query_length_as_double,
assign_length_from_double,
- NULL,
- /* 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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- NULL,
_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,
- NULL,
_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,
- NULL,
_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,
- NULL,
_gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL));
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,
- shadow_value_compute,
- 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,
- shadow_value_compute,
- 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,
- shadow_value_compute,
- NULL,
- NULL,
NULL,
_gtk_css_shadows_value_new_none ());
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_margin,
- NULL,
- compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-left",
GTK_CSS_PROPERTY_MARGIN_LEFT,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_margin,
- NULL,
- compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-bottom",
GTK_CSS_PROPERTY_MARGIN_BOTTOM,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_margin,
- NULL,
- compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-right",
GTK_CSS_PROPERTY_MARGIN_RIGHT,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_margin,
- NULL,
- compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-top",
GTK_CSS_PROPERTY_PADDING_TOP,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_padding,
- NULL,
- compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-left",
GTK_CSS_PROPERTY_PADDING_LEFT,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_padding,
- NULL,
- compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-bottom",
GTK_CSS_PROPERTY_PADDING_BOTTOM,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_padding,
- NULL,
- compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-right",
GTK_CSS_PROPERTY_PADDING_RIGHT,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_padding,
- NULL,
- compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
- /* IMPORTANT: compute_border_width() requires that the border-width
- * properties be immeditaly followed by the border-style properties
+ /* IMPORTANT: the border-width properties must come after border-style properties,
+ * they depend on them for their value computation.
*/
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,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-top-width",
GTK_CSS_PROPERTY_BORDER_TOP_WIDTH,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_border_width,
- NULL,
- compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_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,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-left-width",
GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_border_width,
- NULL,
- compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_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,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-bottom-width",
GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_border_width,
- NULL,
- compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_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,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-right-width",
GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_border_width,
- NULL,
- compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
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,
- border_corner_radius_value_compute,
- 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,
- border_corner_radius_value_compute,
- 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,
- border_corner_radius_value_compute,
- 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,
- border_corner_radius_value_compute,
- 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,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("outline-width",
GTK_CSS_PROPERTY_OUTLINE_WIDTH,
G_TYPE_INT,
GTK_STYLE_PROPERTY_ANIMATED,
parse_border_width,
- NULL,
- compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_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,
- outline_compute,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
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,
- NULL,
- _gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX));
+ _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,
- NULL,
- _gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX));
+ _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,
- background_size_print,
- background_size_compute,
- NULL,
NULL,
NULL,
- _gtk_css_value_new_from_background_size (&default_background_size));
+ _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,
- background_position_compute,
- NULL,
- NULL,
NULL,
- _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_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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- color_compute,
color_query,
color_assign,
- NULL,
- _gtk_css_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,
- NULL,
- _gtk_css_background_repeat_value_new (GTK_CSS_REPEAT_STYLE_REPEAT,
- GTK_CSS_REPEAT_STYLE_REPEAT));
+ _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,
- css_image_value_parse,
- NULL,
- css_image_value_compute,
- css_image_value_query,
- css_image_value_assign,
- NULL,
- _gtk_css_image_value_new (NULL));
+ GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+ background_image_value_parse,
+ background_image_value_query,
+ background_image_value_assign,
+ _gtk_css_array_value_new (_gtk_css_image_value_new (NULL)));
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,
- css_image_value_compute,
css_image_value_query,
css_image_value_assign,
- NULL,
_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,
- NULL,
_gtk_css_border_repeat_value_new (GTK_CSS_REPEAT_STYLE_STRETCH,
GTK_CSS_REPEAT_STYLE_STRETCH));
- /* XXX: The initial value is wrong, it should be 100% */
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_simple,
- assign_simple,
- NULL,
- _gtk_css_value_new_from_boxed (GTK_TYPE_BORDER, &border_of_ones));
+ query_border,
+ assign_border,
+ _gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+ _gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+ _gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+ _gtk_css_number_value_new (100, GTK_CSS_PERCENT)));
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_simple,
- assign_simple,
- NULL,
- _gtk_css_value_new_from_boxed (GTK_TYPE_BORDER, NULL));
+ query_border,
+ assign_border,
+ _gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+ _gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+ _gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+ _gtk_css_number_value_new (1, GTK_CSS_NUMBER)));
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,
- 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,
- 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,
- 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,
- NULL,
_gtk_css_engine_value_new (gtk_theming_engine_load (NULL)));
- gtk_css_style_property_register ("transition",
- GTK_CSS_PROPERTY_TRANSITION,
- GTK_TYPE_ANIMATION_DESCRIPTION,
- 0,
- transition_parse,
- NULL,
- NULL,
- query_simple,
- assign_simple,
- NULL,
- _gtk_css_value_new_from_boxed (GTK_TYPE_ANIMATION_DESCRIPTION, NULL));
/* Private property holding the binding sets */
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,
- NULL,
- _gtk_css_array_value_new (NULL));
+ _gtk_css_array_value_new (_gtk_css_string_value_new (NULL)));
}
projects / ~andy / gtk / blobdiff