From 1440bb25dee3552d23714f9411e806e62fbbd2c7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 1 Sep 2017 14:12:20 -0400 Subject: [PATCH] Fix text colors This was lost in some reshuffling of the gskpango branch. --- gtk/gskpango.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk/gskpango.c b/gtk/gskpango.c index e1d63916bf..a73f25cae0 100644 --- a/gtk/gskpango.c +++ b/gtk/gskpango.c @@ -115,13 +115,16 @@ gsk_pango_renderer_show_text_glyphs (PangoRenderer *renderer, double base_y = (double)y / PANGO_SCALE; int x_offset, y_offset; GskRenderNode *node; + GdkRGBA color; char name[64]; gtk_snapshot_get_offset (crenderer->snapshot, &x_offset, &y_offset); gtk_snapshot_offset (crenderer->snapshot, base_x, base_y); - node = gsk_text_node_new (font, glyphs, &crenderer->fg_color, x_offset, y_offset, base_x, base_y); + get_color (crenderer, PANGO_RENDER_PART_FOREGROUND, &color); + + node = gsk_text_node_new (font, glyphs, &color, x_offset, y_offset, base_x, base_y); snprintf (name, sizeof (name), "Glyphs<%d>", glyphs->num_glyphs); gsk_render_node_set_name (node, name); gtk_snapshot_append_node (crenderer->snapshot, node);