diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-12-13 03:10:25 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-12-15 01:16:23 +0100 |
| commit | 60943737cecd794adcb8ba4e832b2f357d039e26 (patch) | |
| tree | 8c2606621e31956a7ecae38c35b8caef56cc4cb0 | |
| parent | 67d52c6adda0e1ba232d07d1f87920a487435d28 (diff) | |
| download | gtk+-60943737cecd794adcb8ba4e832b2f357d039e26.tar.gz | |
css: Add min-width/height CSS properties
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 28 | ||||
| -rw-r--r-- | gtk/gtkcsstypesprivate.h | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 2b9c51da66..12d56fb644 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -844,6 +844,15 @@ border_image_width_parse (GtkCssStyleProperty *property, } static GtkCssValue * +minmax_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, + GTK_CSS_PARSE_LENGTH + | GTK_CSS_POSITIVE_ONLY); +} + +static GtkCssValue * transition_property_parse_one (GtkCssParser *parser) { GtkCssValue *value; @@ -1605,6 +1614,25 @@ _gtk_css_style_property_init_properties (void) NULL, _gtk_css_transform_value_new_none ()); + gtk_css_style_property_register ("min-width", + GTK_CSS_PROPERTY_MIN_WIDTH, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED, + GTK_CSS_AFFECTS_SIZE, + minmax_parse, + NULL, + NULL, + _gtk_css_number_value_new (0, GTK_CSS_PX)); + gtk_css_style_property_register ("min-height", + GTK_CSS_PROPERTY_MIN_HEIGHT, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED, + GTK_CSS_AFFECTS_SIZE, + minmax_parse, + NULL, + NULL, + _gtk_css_number_value_new (0, GTK_CSS_PX)); + gtk_css_style_property_register ("transition-property", GTK_CSS_PROPERTY_TRANSITION_PROPERTY, G_TYPE_NONE, diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index 0bd818fa3c..1896bfe4af 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -203,6 +203,8 @@ enum { /*< skip >*/ GTK_CSS_PROPERTY_ICON_SHADOW, GTK_CSS_PROPERTY_ICON_STYLE, GTK_CSS_PROPERTY_ICON_TRANSFORM, + GTK_CSS_PROPERTY_MIN_WIDTH, + GTK_CSS_PROPERTY_MIN_HEIGHT, GTK_CSS_PROPERTY_TRANSITION_PROPERTY, GTK_CSS_PROPERTY_TRANSITION_DURATION, GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION, |