[gtk+/wip/cssvalue: 124/137] css: Add a shorthand 'transition' property
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cssvalue: 124/137] css: Add a shorthand 'transition' property
- Date: Sat, 7 Apr 2012 11:17:43 +0000 (UTC)
commit 09ae904f858956a3dd5dea029d18018f95a20a18
Author: Benjamin Otte <otte redhat com>
Date: Wed Apr 4 22:33:27 2012 +0200
css: Add a shorthand 'transition' property
gtk/gtkcssshorthandpropertyimpl.c | 113 +++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 99e2f2a..d00da9a 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -27,6 +27,7 @@
#include "gtkcssarrayvalueprivate.h"
#include "gtkcssbordervalueprivate.h"
#include "gtkcsscornervalueprivate.h"
+#include "gtkcsseasevalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssimageprivate.h"
#include "gtkcssimagevalueprivate.h"
@@ -543,6 +544,111 @@ parse_background (GtkCssShorthandProperty *shorthand,
return TRUE;
}
+static gboolean
+parse_one_transition (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser,
+ GFile *base)
+{
+ do
+ {
+ /* the image part */
+ if (values[2] == NULL &&
+ _gtk_css_parser_has_number (parser))
+ {
+ GtkCssValue *number = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
+
+ if (number == NULL)
+ return FALSE;
+
+ if (values[1] == NULL)
+ values[1] = number;
+ else
+ values[2] = number;
+ }
+ else if (values[3] == NULL &&
+ _gtk_css_ease_value_can_parse (parser))
+ {
+ values[3] = _gtk_css_ease_value_parse (parser);
+
+ if (values[3] == NULL)
+ return FALSE;
+ }
+ else if (values[0] == NULL)
+ {
+ char *ident = _gtk_css_parser_try_ident (parser, TRUE);
+
+ if (ident == NULL)
+ {
+ _gtk_css_parser_error (parser, "Unknown value for property");
+ return FALSE;
+ }
+
+ values[0] = _gtk_css_string_value_new_take (ident);
+ }
+ else
+ {
+ /* We parsed everything and there's still stuff left?
+ * Pretend we didn't notice and let the normal code produce
+ * a 'junk at end of value' error */
+ break;
+ }
+ }
+ while (!value_is_done_parsing (parser));
+
+ return TRUE;
+}
+
+static gboolean
+parse_transition (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser,
+ GFile *base)
+{
+ GtkCssValue *step_values[4];
+ GPtrArray *arrays[4];
+ guint i;
+
+ for (i = 0; i < 4; i++)
+ {
+ arrays[i] = g_ptr_array_new ();
+ step_values[i] = NULL;
+ }
+
+ do {
+ if (!parse_one_transition (shorthand, step_values, parser, base))
+ {
+ for (i = 0; i < 4; i++)
+ {
+ g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
+ g_ptr_array_unref (arrays[i]);
+ return FALSE;
+ }
+ }
+
+ for (i = 0; i < 4; i++)
+ {
+ if (values[i] == NULL)
+ {
+ GtkCssValue *initial = _gtk_css_style_property_get_initial_value (
+ _gtk_css_shorthand_property_get_subproperty (shorthand, i));
+ step_values[i] = _gtk_css_value_ref (_gtk_css_array_value_get_nth (initial, 0));
+ }
+
+ g_ptr_array_add (arrays[i], step_values[i]);
+ step_values[i] = NULL;
+ }
+ } while (_gtk_css_parser_try (parser, ",", TRUE));
+
+ for (i = 0; i < 4; i++)
+ {
+ values[i] = _gtk_css_array_value_new_from_array ((GtkCssValue **) arrays[i]->pdata, arrays[i]->len);
+ g_ptr_array_unref (arrays[i]);
+ }
+
+ return TRUE;
+}
+
/*** PACKING ***/
static void
@@ -840,6 +946,7 @@ _gtk_css_shorthand_property_init_properties (void)
const char *outline_subproperties[] = { "outline-width", "outline-style", "outline-color", NULL };
const char *background_subproperties[] = { "background-image", "background-repeat", "background-clip", "background-origin",
"background-color", NULL };
+ const char *transition_subproperties[] = { "transition-property", "transition-duration", "transition-delay", "transition-timing-function", NULL };
_gtk_css_shorthand_property_register ("font",
PANGO_TYPE_FONT_DESCRIPTION,
@@ -931,4 +1038,10 @@ _gtk_css_shorthand_property_init_properties (void)
parse_background,
NULL,
NULL);
+ _gtk_css_shorthand_property_register ("transition",
+ G_TYPE_NONE,
+ transition_subproperties,
+ parse_transition,
+ NULL,
+ NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]