From bd2ac3e89756b3a0925784e5139c8234b77c3f73 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Jun 2024 21:17:04 -0400 Subject: [PATCH] cairo: Use GdkColor --- gdk/gdkcairo.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index 5b20f09fe9..2aabcf3449 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -23,6 +23,8 @@ #include "gdkcolor.h" #include "gdktexture.h" #include "gdkcolorstate.h" +#include "gdkcolorprivate.h" +#include "gdkmemoryformatprivate.h" #include @@ -37,14 +39,19 @@ void gdk_cairo_set_source_rgba (cairo_t *cr, const GdkRGBA *rgba) { + GdkColor color; + const float *components; + g_return_if_fail (cr != NULL); g_return_if_fail (rgba != NULL); + gdk_color_convert_rgba (&color, gdk_cairo_get_color_state (cr), rgba); + components = gdk_color_get_components (&color); cairo_set_source_rgba (cr, - rgba->red, - rgba->green, - rgba->blue, - rgba->alpha); + components[0], + components[1], + components[2], + components[3]); } /**