Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gskpango: Don't copy fg color

Browse Source 
No need to do that here, we copy it in to the individual render nodes
anyway.
This commit is contained in:
Timm Bäder
2020-12-21 15:23:25 +01:00
parent 526c76181e
commit e90f5e8a20
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gskpango.c
View File

@@ -66,11 +66,11 @@ get_color (GskPangoRenderer *crenderer,
rgba->red = color->red / 65535.;
rgba->green = color->green / 65535.;
rgba->blue = color->blue / 65535.;
rgba->alpha = a ? a / 65535. : crenderer->fg_color.alpha;
rgba->alpha = a ? a / 65535. : crenderer->fg_color->alpha;
}
else
{
*rgba = crenderer->fg_color;
*rgba = *crenderer->fg_color;
if (a)
rgba->alpha = a / 65535.;
}
@@ -502,7 +502,7 @@ gtk_snapshot_append_layout (GtkSnapshot *snapshot,
crenderer = gsk_pango_renderer_acquire ();
crenderer->snapshot = snapshot;
crenderer->fg_color = *color;
crenderer->fg_color = color;
pango_renderer_draw_layout (PANGO_RENDERER (crenderer), layout, 0, 0);

2
gtk/gskpango.h
View File

@@ -58,7 +58,7 @@ struct _GskPangoRenderer
GtkWidget *widget;
GtkSnapshot *snapshot;
GdkRGBA fg_color;
const GdkRGBA *fg_color;
/* Error underline color for this widget */
GdkRGBA *error_color;

2
gtk/gtktextlayout.c
View File

@@ -4164,7 +4164,7 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
crenderer->widget = widget;
crenderer->snapshot = snapshot;
crenderer->fg_color = color;
crenderer->fg_color = &color;
gtk_text_layout_wrap_loop_start (layout);