diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2021-08-27 23:12:24 +0930 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2021-08-28 18:07:01 +0930 |
| commit | fea24631076f74a3202ba0233be85588ae28db36 (patch) | |
| tree | 1df67721f194ad6f161d5d63ddd146d05a0d0b68 /src/cairo-scaled-font-private.h | |
| parent | 5e76dd7a5c0585515eeef5099f12b273c94d3b0f (diff) | |
| download | cairo-fea24631076f74a3202ba0233be85588ae28db36.tar.gz | |
Support color fonts that use the foreground color
COLR fonts can have a layer with the same color as the current text
color. This change passes the current color (if solid) through to
the font backend where it can be used to render color fonts.
scaled_glyph_lookup checks if the foreground color has changed (for
glyph that require it) and requests a new color surface if required.
This also fixes a bug where scaled_glyph_lookup would always request a
color surface for glyphs for glyphs in color fonts that do not have
color.
Diffstat (limited to 'src/cairo-scaled-font-private.h')
| -rw-r--r-- | src/cairo-scaled-font-private.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/cairo-scaled-font-private.h b/src/cairo-scaled-font-private.h index 4bacb1a01..42e9b0913 100644 --- a/src/cairo-scaled-font-private.h +++ b/src/cairo-scaled-font-private.h @@ -147,7 +147,14 @@ struct _cairo_scaled_glyph { void *dev_private; cairo_list_t dev_privates; - cairo_bool_t has_color; + cairo_color_t foreground_color; /* only used for color glyphs */ + /* TRUE if the color_surface used the foreground_color to render. */ + unsigned uses_foreground_color : 1; + + /* TRUE if this is not a color glyph, FALSE if is a color glyph or unknown. */ + unsigned not_color_glyph : 1; + + unsigned has_color : 1; }; struct _cairo_scaled_glyph_private { |