summaryrefslogtreecommitdiff
path: root/gtk/gtkcssnumbervalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2016-02-12 06:56:14 +0100
committerBenjamin Otte <otte@redhat.com>2016-02-13 04:49:08 +0100
commitcd6dc954f2bd173903d805fe3c4810ae25e82490 (patch)
tree8a4f7233a6831d408fbd9633eb3cc4d5d990b040 /gtk/gtkcssnumbervalue.c
parenta52ecd2be61ee46b41267614484ed0401ac5cbc1 (diff)
downloadgtk+-cd6dc954f2bd173903d805fe3c4810ae25e82490.tar.gz
css: Add initial support for calc()
So far, calc() only supports literals, ie it's completely useless.
Diffstat (limited to 'gtk/gtkcssnumbervalue.c')
-rw-r--r--gtk/gtkcssnumbervalue.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c
index 05643d7364..12508db130 100644
--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -19,6 +19,7 @@
#include "gtkcssnumbervalueprivate.h"
+#include "gtkcsscalcvalueprivate.h"
#include "gtkcssdimensionvalueprivate.h"
struct _GtkCssValue {
@@ -51,13 +52,17 @@ _gtk_css_number_value_new (double value,
gboolean
gtk_css_number_value_can_parse (GtkCssParser *parser)
{
- return _gtk_css_parser_has_number (parser);
+ return _gtk_css_parser_has_number (parser)
+ || _gtk_css_parser_has_prefix (parser, "calc");
}
GtkCssValue *
_gtk_css_number_value_parse (GtkCssParser *parser,
GtkCssNumberParseFlags flags)
{
+ if (_gtk_css_parser_has_prefix (parser, "calc"))
+ return gtk_css_calc_value_parse (parser, flags);
+
return gtk_css_dimension_value_parse (parser, flags);
}