[hb-view] Use custom palette if any set

This commit is contained in:
Behdad Esfahbod 2023-01-18 22:33:32 -07:00
parent c41892a012
commit 0bff570491
1 changed files with 5 additions and 3 deletions

View File

@ -122,12 +122,11 @@ helper_cairo_create_scaled_font (const font_options_t *font_opts)
font_options = cairo_font_options_create (); font_options = cairo_font_options_create ();
cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE); cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF); cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF);
#ifdef CAIRO_COLOR_PALETTE_DEFAULT unsigned palette_index = font_opts->palette;
cairo_font_options_set_color_palette (font_options, font_opts->palette);
#endif
#ifdef CAIRO_COLOR_PALETTE_CUSTOM #ifdef CAIRO_COLOR_PALETTE_CUSTOM
if (font_opts->custom_palette) if (font_opts->custom_palette)
{ {
palette_index = HB_PAINT_PALETTE_INDEX_CUSTOM;
char **entries = g_strsplit (font_opts->custom_palette, ",", -1); char **entries = g_strsplit (font_opts->custom_palette, ",", -1);
for (unsigned int i = 0; entries[i]; i++) for (unsigned int i = 0; entries[i]; i++)
{ {
@ -137,6 +136,9 @@ helper_cairo_create_scaled_font (const font_options_t *font_opts)
} }
} }
#endif #endif
#ifdef CAIRO_COLOR_PALETTE_DEFAULT
cairo_font_options_set_color_palette (font_options, palette_index);
#endif
cairo_scaled_font_t *scaled_font = cairo_scaled_font_create (cairo_face, cairo_scaled_font_t *scaled_font = cairo_scaled_font_create (cairo_face,
&font_matrix, &font_matrix,