diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-12 14:09:36 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-12 14:50:02 -0400 |
| commit | 54ff5d8edddf81382f1053fbbdb2b7a1c07b67be (patch) | |
| tree | 83a9161fb134f98b6c694b5dfd1bc6a2c3a935b0 | |
| parent | b18320fe058a4287aee64d43acf37f035f54d223 (diff) | |
| download | gtk+-54ff5d8edddf81382f1053fbbdb2b7a1c07b67be.tar.gz | |
Revert "css: Simplify default values"
This reverts commit 1efa39672b94ba12f42f386d0eedb7ed6d7c3d03.
We want to use corner values for corner properties.
| -rw-r--r-- | gtk/gtkcssinitialvalue.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index 381ec21e61..2ca5efe8b4 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -64,7 +64,7 @@ gtk_css_value_initial_compute (GtkCssValue *value, case GTK_CSS_PROPERTY_FONT_FAMILY: settings = gtk_style_provider_get_settings (provider); if (settings && gtk_settings_get_font_family (settings) != NULL) - return _gtk_css_string_value_new (gtk_settings_get_font_family (settings)); + return _gtk_css_array_value_new (_gtk_css_string_value_new (gtk_settings_get_font_family (settings))); break; default: diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index c06b31ddfb..f3176a203b 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1095,25 +1095,29 @@ _gtk_css_style_property_init_properties (void) GTK_STYLE_PROPERTY_ANIMATED, GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER, border_corner_radius_value_parse, - _gtk_css_number_value_new (0, GTK_CSS_PX)); + _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, GTK_STYLE_PROPERTY_ANIMATED, GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER, border_corner_radius_value_parse, - _gtk_css_number_value_new (0, GTK_CSS_PX)); + _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, GTK_STYLE_PROPERTY_ANIMATED, GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER, border_corner_radius_value_parse, - _gtk_css_number_value_new (0, GTK_CSS_PX)); + _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, GTK_STYLE_PROPERTY_ANIMATED, GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER, border_corner_radius_value_parse, - _gtk_css_number_value_new (0, GTK_CSS_PX)); + _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, @@ -1133,7 +1137,6 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_AFFECTS_OUTLINE, outline_parse, _gtk_css_number_value_new (0.0, GTK_CSS_PX)); - gtk_css_style_property_register ("background-clip", GTK_CSS_PROPERTY_BACKGROUND_CLIP, 0, |