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/gtkrenderborder.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/gtkrenderborder.c')
| -rw-r--r-- | gtk/gtkrenderborder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkrenderborder.c b/gtk/gtkrenderborder.c index 45c4e25321..232418ad64 100644 --- a/gtk/gtkrenderborder.c +++ b/gtk/gtkrenderborder.c @@ -31,7 +31,7 @@ #include "gtkcssimagevalueprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssrepeatvalueprivate.h" -#include "gtkcssrgbavalueprivate.h" +#include "gtkcsscolorvalueprivate.h" #include "gtkcssstyleprivate.h" #include "gtkhslaprivate.h" #include "gtkroundedboxprivate.h" @@ -683,10 +683,10 @@ gtk_css_style_snapshot_border (GtkCssBoxes *boxes, gtk_css_boxes_get_padding_rect (boxes))) return; - colors[0] = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_TOP_COLOR)); - colors[1] = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR)); - colors[2] = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR)); - colors[3] = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR)); + colors[0] = *gtk_css_color_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_TOP_COLOR)); + colors[1] = *gtk_css_color_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR)); + colors[2] = *gtk_css_color_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR)); + colors[3] = *gtk_css_color_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR)); alpha_test_vector = graphene_simd4f_init (colors[0].alpha, colors[1].alpha, colors[2].alpha, colors[3].alpha); if (graphene_simd4f_is_zero4 (alpha_test_vector)) @@ -726,7 +726,7 @@ gtk_css_style_snapshot_outline (GtkCssBoxes *boxes, border_style[1] = border_style[2] = border_style[3] = border_style[0]; border_width[0] = _gtk_css_number_value_get (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_OUTLINE_WIDTH), 100); border_width[3] = border_width[2] = border_width[1] = border_width[0]; - colors[0] = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_OUTLINE_COLOR)); + colors[0] = *gtk_css_color_value_get_rgba (gtk_css_style_get_value (boxes->style, GTK_CSS_PROPERTY_OUTLINE_COLOR)); colors[3] = colors[2] = colors[1] = colors[0]; snapshot_border (snapshot, |