diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-12-24 13:52:20 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-25 09:44:41 -0500 |
commit | 3999bcfa2c903d1d00bcbddfb750c474460e9064 (patch) | |
tree | 175fb825ae75349d4d4368614d37d527b66eca2c | |
parent | 0f538480c01e8df94047614e2092236daf99d498 (diff) | |
download | pango-3999bcfa2c903d1d00bcbddfb750c474460e9064.tar.gz |
itemize: Try harder to avoid NULL fonts
Always fall back to the base font if the fontset
has no coverage.
-rw-r--r-- | pango/itemize.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pango/itemize.c b/pango/itemize.c index 9aa0c29c..442fe8e9 100644 --- a/pango/itemize.c +++ b/pango/itemize.c @@ -772,7 +772,8 @@ get_font (ItemizeState *state, GetFontInfo info; /* We'd need a separate cache when fallback is disabled, but since lookup - * with fallback disabled is faster anyways, we just skip caching */ + * with fallback disabled is faster anyways, we just skip caching + */ if (state->enable_fallback && font_cache_get (state->cache, wc, font, position)) return TRUE; @@ -783,8 +784,9 @@ get_font (ItemizeState *state, if (state->enable_fallback) pango_fontset_foreach (state->current_fonts, get_font_foreach, &info); - else - get_font_foreach (NULL, get_base_font (state), &info); + + if (!info.font) + info.font = get_base_font (state); *font = info.font; *position = info.position; |