mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-05 19:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fonts: Create a fallback glyph if none is available (fix crash on fonts with no fallback)

Browse Source
This commit is contained in:
ocornut
2025-02-05 14:04:05 +01:00
parent 066b24d741
commit 96786a183b
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
imgui_draw.cpp
View File

@@ -3545,20 +3545,27 @@ bool ImFontAtlasBuildAddFont(ImFontAtlas* atlas, ImFontConfig* src)
static void ImFontAtlasBuildSetupFontBakedSpecialGlyphs(ImFontAtlas* atlas, ImFont* font, ImFontBaked* baked) static void ImFontAtlasBuildSetupFontBakedSpecialGlyphs(ImFontAtlas* atlas, ImFont* font, ImFontBaked* baked)
{ {
// FIXME-NEWATLAS: could we use a scheme where this is lazily loaded?
IM_ASSERT(baked->FallbackGlyphIndex == -1);
if (font->FallbackChar != 0)
if (const ImFontGlyph* glyph = baked->FindGlyphNoFallback(font->FallbackChar))
{
baked->FallbackGlyphIndex = baked->Glyphs.index_from_ptr(glyph); // Storing index avoid need to update pointer on growth.
baked->FallbackAdvanceX = glyph->AdvanceX;
}
// Mark space as always hidden (not strictly correct/necessary. but some e.g. icons fonts don't have a space. it tends to look neater in previews) // Mark space as always hidden (not strictly correct/necessary. but some e.g. icons fonts don't have a space. it tends to look neater in previews)
ImFontGlyph* space_glyph = (ImFontGlyph*)(void*)baked->FindGlyphNoFallback((ImWchar)' '); ImFontGlyph* space_glyph = (ImFontGlyph*)(void*)baked->FindGlyphNoFallback((ImWchar)' ');
if (space_glyph != NULL) if (space_glyph != NULL)
space_glyph->Visible = false; space_glyph->Visible = false;
// Load fallback in order to obtain its index
// FIXME-NEWATLAS: could we use a scheme where this is lazily loaded?
IM_ASSERT(baked->FallbackGlyphIndex == -1);
ImFontGlyph* fallback_glyph = NULL;
if (font->FallbackChar != 0)
fallback_glyph = baked->FindGlyphNoFallback(font->FallbackChar);
if (fallback_glyph == NULL)
{
ImFontGlyph glyph;
glyph.Codepoint = 0;
glyph.AdvanceX = space_glyph ? space_glyph->AdvanceX : IM_ROUND(baked->Size * 0.40f);
fallback_glyph = ImFontAtlasBakedAddFontGlyph(atlas, baked, NULL, &glyph);
}
baked->FallbackGlyphIndex = baked->Glyphs.index_from_ptr(fallback_glyph); // Storing index avoid need to update pointer on growth and simplify inner loop code
baked->FallbackAdvanceX = fallback_glyph->AdvanceX;
// Setup Tab character. // Setup Tab character.
// FIXME: Needs proper TAB handling but it needs to be contextualized (or we could arbitrary say that each string starts at "column 0" ?) // FIXME: Needs proper TAB handling but it needs to be contextualized (or we could arbitrary say that each string starts at "column 0" ?)
if (baked->FindGlyphNoFallback('\t') == NULL && space_glyph != NULL) if (baked->FindGlyphNoFallback('\t') == NULL && space_glyph != NULL)