diff options
| author | Timm Bäder <mail@baedert.org> | 2020-01-10 13:02:33 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2020-01-18 08:49:51 +0100 |
| commit | 67991ed0f405eca73e4c2f78f3e0d1c6c1a8de2c (patch) | |
| tree | 96ffafb8af8006940199f547fadc7266cb147daf /gtk/gtkcssstylepropertyimpl.c | |
| parent | 741e12012dcee880d72fd292b62c4d8d5b7dd276 (diff) | |
| download | gtk+-67991ed0f405eca73e4c2f78f3e0d1c6c1a8de2c.tar.gz | |
Remove GtkCssRgbaValue
The differenciation between a literal color value and an RGBA value
caused problems in various situations. Just treat the two the same but
don't allow access to the rgba value of a non-literal color value.
This gets rid of around 1.6k rgba values in the widget-factory.
Diffstat (limited to 'gtk/gtkcssstylepropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 02e9521403..eee5bfbde3 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -53,7 +53,6 @@ #include "gtkcsspalettevalueprivate.h" #include "gtkcsspositionvalueprivate.h" #include "gtkcssrepeatvalueprivate.h" -#include "gtkcssrgbavalueprivate.h" #include "gtkcssshadowsvalueprivate.h" #include "gtkcssstringvalueprivate.h" #include "gtkcsstransformvalueprivate.h" @@ -150,7 +149,7 @@ color_query (GtkCssStyleProperty *property, GValue *value) { g_value_init (value, GDK_TYPE_RGBA); - g_value_set_boxed (value, _gtk_css_rgba_value_get_rgba (css_value)); + g_value_set_boxed (value, gtk_css_color_value_get_rgba (css_value)); } static GtkCssValue * @@ -936,7 +935,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_AFFECTS_CONTENT | GTK_CSS_AFFECTS_SYMBOLIC_ICON, color_parse, color_query, - _gtk_css_rgba_value_new_white ()); + gtk_css_color_value_new_white ()); gtk_css_style_property_register ("-gtk-dpi", GTK_CSS_PROPERTY_DPI, G_TYPE_NONE, @@ -980,7 +979,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_AFFECTS_BACKGROUND, color_parse, color_query, - _gtk_css_rgba_value_new_transparent ()); + gtk_css_color_value_new_transparent ()); gtk_css_style_property_register ("font-family", GTK_CSS_PROPERTY_FONT_FAMILY, |