isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl-pango: Honor foreground alpha PangoAttribute

Browse Source 
Instead of hardcoding 0xff as alpha, forward this attribute.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1155
This commit is contained in:
Carlos Garnacho 2020-03-27 23:05:03 +01:00
parent 92710d8f89
commit 2d94a34a14
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/cogl-pango/cogl-pango-render.c
View File

@ -719,6 +719,7 @@ cogl_pango_renderer_set_color_for_part (PangoRenderer *renderer,
PangoRenderPart part) PangoRenderPart part)
{ {
PangoColor *pango_color = pango_renderer_get_color (renderer, part); PangoColor *pango_color = pango_renderer_get_color (renderer, part);
uint16_t alpha = pango_renderer_get_alpha (renderer, part);
CoglPangoRenderer *priv = COGL_PANGO_RENDERER (renderer); CoglPangoRenderer *priv = COGL_PANGO_RENDERER (renderer);
if (pango_color) if (pango_color)
@ -729,7 +730,7 @@ cogl_pango_renderer_set_color_for_part (PangoRenderer *renderer,
pango_color->red >> 8, pango_color->red >> 8,
pango_color->green >> 8, pango_color->green >> 8,
pango_color->blue >> 8, pango_color->blue >> 8,
0xff); alpha >> 8);
_cogl_pango_display_list_set_color_override (priv->display_list, &color); _cogl_pango_display_list_set_color_override (priv->display_list, &color);
} }
@ -908,8 +909,11 @@ cogl_pango_renderer_draw_glyphs (PangoRenderer *renderer,
if (cache_value->has_color) if (cache_value->has_color)
{ {
CoglColor color; CoglColor color;
uint16_t alpha;
cogl_color_init_from_4ub (&color, 0xff, 0xff, 0xff, 0xff); alpha = pango_renderer_get_alpha (renderer,
PANGO_RENDER_PART_FOREGROUND);
cogl_color_init_from_4ub (&color, 0xff, 0xff, 0xff, alpha >> 8);
_cogl_pango_display_list_set_color_override (priv->display_list, &color); _cogl_pango_display_list_set_color_override (priv->display_list, &color);
} }