Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-06-02 11:06:51 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fonts: make ImFont::Sources a vector.

Browse Source 
Later it should become a ImSpan<>
This commit is contained in:
ocornut
2025-04-24 17:54:16 +02:00
parent e7efe94fd2
commit 2b0d49a905
4 changed files with 58 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui.cpp
+7 -5
View File
@@ -16612,7 +16612,7 @@ void ImGui::DebugNodeFont(ImFont* font)
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig; ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig;
ImFontAtlas* atlas = font->ContainerAtlas; ImFontAtlas* atlas = font->ContainerAtlas;
bool opened = TreeNode(font, "Font: \"%s\": %d sources(s)", font->GetDebugName(), font->SourcesCount); bool opened = TreeNode(font, "Font: \"%s\": %d sources(s)", font->GetDebugName(), font->Sources.Size);
// Display preview text // Display preview text
if (!opened) if (!opened)
@@ -16652,8 +16652,9 @@ void ImGui::DebugNodeFont(ImFont* font)
Text("Fallback character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->FallbackChar), font->FallbackChar); Text("Fallback character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->FallbackChar), font->FallbackChar);
Text("Ellipsis character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->EllipsisChar), font->EllipsisChar); Text("Ellipsis character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->EllipsisChar), font->EllipsisChar);
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (int src_n = 0; src_n < font->Sources.Size; src_n++)
if (ImFontConfig* src = &font->Sources[src_n]) {
ImFontConfig* src = font->Sources[src_n];
if (TreeNode(src, "Input %d: \'%s\', Oversample: %d,%d, PixelSnapH: %d, Offset: (%.1f,%.1f)", if (TreeNode(src, "Input %d: \'%s\', Oversample: %d,%d, PixelSnapH: %d, Offset: (%.1f,%.1f)",
src_n, src->Name, src->OversampleH, src->OversampleV, src->PixelSnapH, src->GlyphOffset.x, src->GlyphOffset.y)) src_n, src->Name, src->OversampleH, src->OversampleV, src->PixelSnapH, src->GlyphOffset.x, src->GlyphOffset.y))
{ {
@@ -16674,6 +16675,7 @@ void ImGui::DebugNodeFont(ImFont* font)
#endif #endif
TreePop(); TreePop();
} }
}
// Display all glyphs of the fonts in separate pages of 256 characters // Display all glyphs of the fonts in separate pages of 256 characters
for (int baked_n = 0; baked_n < atlas->Builder->BakedPool.Size; baked_n++) for (int baked_n = 0; baked_n < atlas->Builder->BakedPool.Size; baked_n++)
@@ -16691,9 +16693,9 @@ void ImGui::DebugNodeFont(ImFont* font)
const int surface_sqrt = (int)ImSqrt((float)baked->MetricsTotalSurface); const int surface_sqrt = (int)ImSqrt((float)baked->MetricsTotalSurface);
Text("Ascent: %f, Descent: %f, Ascent-Descent: %f", baked->Ascent, baked->Descent, baked->Ascent - baked->Descent); Text("Ascent: %f, Descent: %f, Ascent-Descent: %f", baked->Ascent, baked->Descent, baked->Ascent - baked->Descent);
Text("Texture Area: about %d px ~%dx%d px", baked->MetricsTotalSurface, surface_sqrt, surface_sqrt); Text("Texture Area: about %d px ~%dx%d px", baked->MetricsTotalSurface, surface_sqrt, surface_sqrt);
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (int src_n = 0; src_n < font->Sources.Size; src_n++)
{ {
ImFontConfig* src = &font->Sources[src_n]; ImFontConfig* src = font->Sources[src_n];
int oversample_h, oversample_v; int oversample_h, oversample_v;
ImFontAtlasBuildGetOversampleFactors(src, baked->Size, &oversample_h, &oversample_v); ImFontAtlasBuildGetOversampleFactors(src, baked->Size, &oversample_h, &oversample_v);
BulletText("Input %d: \'%s\', Oversample: (%d=>%d,%d=>%d), PixelSnapH: %d, Offset: (%.1f,%.1f)", BulletText("Input %d: \'%s\', Oversample: (%d=>%d,%d=>%d), PixelSnapH: %d, Offset: (%.1f,%.1f)",
imgui.h
+2 -3
View File
@@ -3759,8 +3759,7 @@ struct ImFont
// Conceptually Sources[] is the list of font sources merged to create this font. // Conceptually Sources[] is the list of font sources merged to create this font.
ImGuiID FontId; // Unique identifier for the font ImGuiID FontId; // Unique identifier for the font
float DefaultSize; // 4 // in // Default font size float DefaultSize; // 4 // in // Default font size
short SourcesCount; // 2 // in // Number of ImFontConfig involved in creating this font. Usually 1, or >1 when merging multiple font sources into one ImFont. ImVector<ImFontConfig*> Sources; // 16 // in // List of sources. Pointers within ContainerAtlas->Sources[]
ImFontConfig* Sources; // 4-8 // in // Pointer within ContainerAtlas->Sources[], to SourcesCount instances
ImWchar EllipsisChar; // 2-4 // out // Character used for ellipsis rendering ('...'). ImWchar EllipsisChar; // 2-4 // out // Character used for ellipsis rendering ('...').
ImWchar FallbackChar; // 2-4 // out // Character used if a glyph isn't found (U+FFFD, '?') ImWchar FallbackChar; // 2-4 // out // Character used if a glyph isn't found (U+FFFD, '?')
float Scale; // 4 // in // Base font scale (~1.0f), multiplied by the per-window font scale which you can adjust with SetWindowFontScale() float Scale; // 4 // in // Base font scale (~1.0f), multiplied by the per-window font scale which you can adjust with SetWindowFontScale()
@@ -3773,7 +3772,7 @@ struct ImFont
IMGUI_API ImFontBaked* GetFontBaked(float font_size); // Get or create baked data for given size IMGUI_API ImFontBaked* GetFontBaked(float font_size); // Get or create baked data for given size
IMGUI_API bool IsGlyphInFont(ImWchar c); IMGUI_API bool IsGlyphInFont(ImWchar c);
bool IsLoaded() const { return ContainerAtlas != NULL; } bool IsLoaded() const { return ContainerAtlas != NULL; }
const char* GetDebugName() const { return Sources ? Sources[0].Name : "<unknown>"; } // Fill ImFontConfig::Name. const char* GetDebugName() const { return Sources.Size ? Sources[0]->Name : "<unknown>"; } // Fill ImFontConfig::Name.
// [Internal] Don't use! // [Internal] Don't use!
// 'max_width' stops rendering after a certain width (could be turned into a 2d size). FLT_MAX to disable. // 'max_width' stops rendering after a certain width (could be turned into a 2d size). FLT_MAX to disable.
imgui_draw.cpp
+31 -41
View File
@@ -2657,8 +2657,7 @@ void ImFontAtlas::ClearInputData()
for (ImFont* font : Fonts) for (ImFont* font : Fonts)
{ {
// When clearing this we lose access to the font name and other information used to build the font. // When clearing this we lose access to the font name and other information used to build the font.
font->Sources = NULL; font->Sources.clear();
font->SourcesCount = 0;
font->Flags |= ImFontFlags_NoLoadGlyphs; font->Flags |= ImFontFlags_NoLoadGlyphs;
} }
Sources.clear(); Sources.clear();
@@ -3027,14 +3026,14 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg_in)
IM_ASSERT(font_cfg->FontLoaderData == NULL); IM_ASSERT(font_cfg->FontLoaderData == NULL);
// Pointers to Sources are otherwise dangling // Pointers to Sources are otherwise dangling
font->SourcesCount++; font->Sources.push_back(font_cfg);
ImFontAtlasBuildUpdatePointers(this); ImFontAtlasBuildUpdatePointers(this);
if (!ImFontAtlasFontInitSource(this, font_cfg)) if (!ImFontAtlasFontInitSource(this, font_cfg))
{ {
// Rollback (this is a fragile/rarely exercised code-path. TestSuite's "misc_atlas_add_invalid_font" aim to test this) // Rollback (this is a fragile/rarely exercised code-path. TestSuite's "misc_atlas_add_invalid_font" aim to test this)
ImFontAtlasFontDestroySourceData(this, font_cfg); ImFontAtlasFontDestroySourceData(this, font_cfg);
Sources.pop_back(); Sources.pop_back();
font->SourcesCount--; font->Sources.pop_back();
if (!font_cfg->MergeMode) if (!font_cfg->MergeMode)
{ {
IM_DELETE(font); IM_DELETE(font);
@@ -3185,14 +3184,16 @@ void ImFontAtlas::RemoveFont(ImFont* font)
font->ClearOutputData(); font->ClearOutputData();
ImFontAtlasFontDestroyOutput(this, font); ImFontAtlasFontDestroyOutput(this, font);
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
ImFontAtlasFontDestroySourceData(this, &font->Sources[src_n]); {
ImFontAtlasFontDestroySourceData(this, src);
Sources.erase(src);
}
bool removed = Fonts.find_erase(font); bool removed = Fonts.find_erase(font);
IM_ASSERT(removed); IM_ASSERT(removed);
IM_UNUSED(removed); IM_UNUSED(removed);
Sources.erase(font->Sources, font->Sources + font->SourcesCount);
ImFontAtlasBuildUpdatePointers(this); ImFontAtlasBuildUpdatePointers(this);
font->ContainerAtlas = NULL; font->ContainerAtlas = NULL;
@@ -3278,7 +3279,7 @@ ImFontAtlasRectId ImFontAtlas::AddCustomRectFontGlyphForSize(ImFont* font, float
glyph.Visible = true; glyph.Visible = true;
glyph.Colored = true; // FIXME: Arbitrary glyph.Colored = true; // FIXME: Arbitrary
glyph.PackId = r_id; glyph.PackId = r_id;
ImFontAtlasBakedAddFontGlyph(this, baked, &font->Sources[0], &glyph); ImFontAtlasBakedAddFontGlyph(this, baked, font->Sources[0], &glyph);
return r_id; return r_id;
} }
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS #endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -3382,15 +3383,13 @@ void ImFontAtlasBuildPreloadAllGlyphRanges(ImFontAtlas* atlas)
atlas->Builder->PreloadedAllGlyphsRanges = true; atlas->Builder->PreloadedAllGlyphsRanges = true;
for (ImFont* font : atlas->Fonts) for (ImFont* font : atlas->Fonts)
{ {
ImFontConfig* src = &font->Sources[0]; ImFontBaked* baked = font->GetFontBaked(font->Sources[0]->SizePixels);
ImFontBaked* baked = font->GetFontBaked(src->SizePixels);
if (font->FallbackChar != 0) if (font->FallbackChar != 0)
baked->FindGlyph(font->FallbackChar); baked->FindGlyph(font->FallbackChar);
if (font->EllipsisChar != 0) if (font->EllipsisChar != 0)
baked->FindGlyph(font->EllipsisChar); baked->FindGlyph(font->EllipsisChar);
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
{ {
src = &font->Sources[src_n];
const ImWchar* ranges = src->GlyphRanges ? src->GlyphRanges : atlas->GetGlyphRangesDefault(); const ImWchar* ranges = src->GlyphRanges ? src->GlyphRanges : atlas->GetGlyphRangesDefault();
for (; ranges[0]; ranges += 2) for (; ranges[0]; ranges += 2)
for (unsigned int c = ranges[0]; c <= ranges[1] && c <= IM_UNICODE_CODEPOINT_MAX; c++) //-V560 for (unsigned int c = ranges[0]; c <= ranges[1] && c <= IM_UNICODE_CODEPOINT_MAX; c++) //-V560
@@ -3399,15 +3398,13 @@ void ImFontAtlasBuildPreloadAllGlyphRanges(ImFontAtlas* atlas)
} }
} }
// FIXME: May make ImFont::Sources a ImSpan<> and move ownership to ImFontAtlas
void ImFontAtlasBuildUpdatePointers(ImFontAtlas* atlas) void ImFontAtlasBuildUpdatePointers(ImFontAtlas* atlas)
{ {
for (int src_n = 0; src_n < atlas->Sources.Size; src_n++) for (ImFont* font : atlas->Fonts)
{ font->Sources.resize(0);
ImFontConfig* src = &atlas->Sources[src_n]; for (ImFontConfig& src : atlas->Sources)
ImFont* font = src->DstFont; src.DstFont->Sources.push_back(&src);
if (!src->MergeMode)
font->Sources = src;
}
} }
// Render a white-colored bitmap encoded in a string // Render a white-colored bitmap encoded in a string
@@ -3542,9 +3539,8 @@ static void ImFontAtlasBuildUpdateLinesTexData(ImFontAtlas* atlas)
bool ImFontAtlasFontInitOutput(ImFontAtlas* atlas, ImFont* font) bool ImFontAtlasFontInitOutput(ImFontAtlas* atlas, ImFont* font)
{ {
bool ret = true; bool ret = true;
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader && loader->FontSrcInit != NULL && !loader->FontSrcInit(atlas, src)) if (loader && loader->FontSrcInit != NULL && !loader->FontSrcInit(atlas, src))
ret = false; ret = false;
@@ -3557,9 +3553,8 @@ bool ImFontAtlasFontInitOutput(ImFontAtlas* atlas, ImFont* font)
void ImFontAtlasFontDestroyOutput(ImFontAtlas* atlas, ImFont* font) void ImFontAtlasFontDestroyOutput(ImFontAtlas* atlas, ImFont* font)
{ {
font->ClearOutputData(); font->ClearOutputData();
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader && loader->FontSrcDestroy != NULL) if (loader && loader->FontSrcDestroy != NULL)
loader->FontSrcDestroy(atlas, src); loader->FontSrcDestroy(atlas, src);
@@ -3576,7 +3571,7 @@ bool ImFontAtlasFontInitSource(ImFontAtlas* atlas, ImFontConfig* src)
font->ClearOutputData(); font->ClearOutputData();
//font->FontSize = src->SizePixels; //font->FontSize = src->SizePixels;
font->ContainerAtlas = atlas; font->ContainerAtlas = atlas;
IM_ASSERT(font->Sources == src); IM_ASSERT(font->Sources[0] == src);
} }
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
@@ -3688,10 +3683,8 @@ static void ImFontAtlasBuildSetupFontBakedBlanks(ImFontAtlas* atlas, ImFontBaked
// (note that this is called again for fonts with MergeMode) // (note that this is called again for fonts with MergeMode)
void ImFontAtlasBuildSetupFontSpecialGlyphs(ImFontAtlas* atlas, ImFont* font, ImFontConfig* src) void ImFontAtlasBuildSetupFontSpecialGlyphs(ImFontAtlas* atlas, ImFont* font, ImFontConfig* src)
{ {
const int src_idx_in_font = (int)(src - font->Sources);
IM_ASSERT(src_idx_in_font >= 0 && src_idx_in_font < font->SourcesCount);
IM_UNUSED(atlas); IM_UNUSED(atlas);
IM_UNUSED(src_idx_in_font); IM_ASSERT(font->Sources.contains(src));
// Find Fallback character. Actual glyph loaded in GetFontBaked(). // Find Fallback character. Actual glyph loaded in GetFontBaked().
const ImWchar fallback_chars[] = { font->FallbackChar, (ImWchar)IM_UNICODE_CODEPOINT_INVALID, (ImWchar)'?', (ImWchar)' ' }; const ImWchar fallback_chars[] = { font->FallbackChar, (ImWchar)IM_UNICODE_CODEPOINT_INVALID, (ImWchar)'?', (ImWchar)' ' };
@@ -3747,17 +3740,15 @@ ImFontBaked* ImFontAtlasBakedAdd(ImFontAtlas* atlas, ImFont* font, float font_si
// Initialize backend data // Initialize backend data
size_t loader_data_size = 0; size_t loader_data_size = 0;
for (int src_n = 0; src_n < font->SourcesCount; src_n++) // Cannot easily be cached as we allow changing backend for (ImFontConfig* src : font->Sources) // Cannot easily be cached as we allow changing backend
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
loader_data_size += loader->FontBakedSrcLoaderDataSize; loader_data_size += loader->FontBakedSrcLoaderDataSize;
} }
baked->FontLoaderDatas = (loader_data_size > 0) ? IM_ALLOC(loader_data_size) : NULL; baked->FontLoaderDatas = (loader_data_size > 0) ? IM_ALLOC(loader_data_size) : NULL;
char* loader_data_p = (char*)baked->FontLoaderDatas; char* loader_data_p = (char*)baked->FontLoaderDatas;
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader->FontBakedInit) if (loader->FontBakedInit)
loader->FontBakedInit(atlas, src, baked, loader_data_p); loader->FontBakedInit(atlas, src, baked, loader_data_p);
@@ -3802,9 +3793,8 @@ void ImFontAtlasBakedDiscard(ImFontAtlas* atlas, ImFont* font, ImFontBaked* bake
ImFontAtlasPackDiscardRect(atlas, glyph.PackId); ImFontAtlasPackDiscardRect(atlas, glyph.PackId);
char* loader_data_p = (char*)baked->FontLoaderDatas; char* loader_data_p = (char*)baked->FontLoaderDatas;
for (int src_n = 0; src_n < font->SourcesCount; src_n++) for (ImFontConfig* src : font->Sources)
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader->FontBakedDestroy) if (loader->FontBakedDestroy)
loader->FontBakedDestroy(atlas, src, baked, loader_data_p); loader->FontBakedDestroy(atlas, src, baked, loader_data_p);
@@ -4384,9 +4374,9 @@ static ImFontGlyph* ImFontBaked_BuildLoadGlyph(ImFontBaked* baked, ImWchar codep
// Call backend // Call backend
char* loader_user_data_p = (char*)baked->FontLoaderDatas; char* loader_user_data_p = (char*)baked->FontLoaderDatas;
for (int src_n = 0; src_n < font->SourcesCount; src_n++) int src_n = 0;
for (ImFontConfig* src : font->Sources)
{ {
ImFontConfig* src = &font->Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (!src->GlyphExcludeRanges || ImFontAtlasBuildAcceptCodepointForSource(src, codepoint)) if (!src->GlyphExcludeRanges || ImFontAtlasBuildAcceptCodepointForSource(src, codepoint))
if (ImFontGlyph* glyph = loader->FontBakedLoadGlyph(atlas, src, baked, loader_user_data_p, codepoint)) if (ImFontGlyph* glyph = loader->FontBakedLoadGlyph(atlas, src, baked, loader_user_data_p, codepoint))
@@ -4396,6 +4386,7 @@ static ImFontGlyph* ImFontBaked_BuildLoadGlyph(ImFontBaked* baked, ImWchar codep
return glyph; return glyph;
} }
loader_user_data_p += loader->FontBakedSrcLoaderDataSize; loader_user_data_p += loader->FontBakedSrcLoaderDataSize;
src_n++;
} }
// Lazily load fallback glyph // Lazily load fallback glyph
@@ -4491,8 +4482,8 @@ static bool ImGui_ImplStbTrueType_FontSrcInit(ImFontAtlas* atlas, ImFontConfig*
bd_font_data->ScaleFactor = stbtt_ScaleForPixelHeight(&bd_font_data->FontInfo, 1.0f); bd_font_data->ScaleFactor = stbtt_ScaleForPixelHeight(&bd_font_data->FontInfo, 1.0f);
else else
bd_font_data->ScaleFactor = -stbtt_ScaleForMappingEmToPixels(&bd_font_data->FontInfo, 1.0f); bd_font_data->ScaleFactor = -stbtt_ScaleForMappingEmToPixels(&bd_font_data->FontInfo, 1.0f);
if (src > src->DstFont->Sources) if (src != src->DstFont->Sources[0])
bd_font_data->ScaleFactor *= src->SizePixels / src->DstFont->Sources[0].SizePixels; // FIXME-NEWATLAS: Should tidy up that a bit bd_font_data->ScaleFactor *= src->SizePixels / src->DstFont->Sources[0]->SizePixels; // FIXME-NEWATLAS: Should tidy up that a bit
return true; return true;
} }
@@ -4594,7 +4585,7 @@ static ImFontGlyph* ImGui_ImplStbTrueType_FontBakedLoadGlyph(ImFontAtlas* atlas,
if (oversample_v > 1) if (oversample_v > 1)
stbtt__v_prefilter(bitmap_pixels, r->w, r->h, r->w, oversample_v); stbtt__v_prefilter(bitmap_pixels, r->w, r->h, r->w, oversample_v);
const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0].SizePixels; const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0]->SizePixels;
float font_off_x = (src->GlyphOffset.x * offsets_scale); float font_off_x = (src->GlyphOffset.x * offsets_scale);
float font_off_y = (src->GlyphOffset.y * offsets_scale); float font_off_y = (src->GlyphOffset.y * offsets_scale);
if (src->PixelSnapH) // Snap scaled offset. This is to mitigate backward compatibility issues for GlyphOffset, but a better design would be welcome. if (src->PixelSnapH) // Snap scaled offset. This is to mitigate backward compatibility issues for GlyphOffset, but a better design would be welcome.
@@ -5036,7 +5027,7 @@ ImFontGlyph* ImFontAtlasBakedAddFontGlyph(ImFontAtlas* atlas, ImFontBaked* baked
if (src != NULL) if (src != NULL)
{ {
// Clamp & recenter if needed // Clamp & recenter if needed
const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0].SizePixels; const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0]->SizePixels;
float advance_x = ImClamp(glyph->AdvanceX, src->GlyphMinAdvanceX * offsets_scale, src->GlyphMaxAdvanceX * offsets_scale); float advance_x = ImClamp(glyph->AdvanceX, src->GlyphMinAdvanceX * offsets_scale, src->GlyphMaxAdvanceX * offsets_scale);
if (advance_x != glyph->AdvanceX) if (advance_x != glyph->AdvanceX)
{ {
@@ -5147,9 +5138,8 @@ bool ImFontBaked::IsGlyphLoaded(ImWchar c)
bool ImFont::IsGlyphInFont(ImWchar c) bool ImFont::IsGlyphInFont(ImWchar c)
{ {
ImFontAtlas* atlas = ContainerAtlas; ImFontAtlas* atlas = ContainerAtlas;
for (int src_n = 0; src_n < SourcesCount; src_n++) for (ImFontConfig* src : Sources)
{ {
ImFontConfig* src = &Sources[src_n];
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader; const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader->FontSrcContainsGlyph != NULL && loader->FontSrcContainsGlyph(atlas, src, c)) if (loader->FontSrcContainsGlyph != NULL && loader->FontSrcContainsGlyph(atlas, src, c))
return true; return true;
misc/freetype/imgui_freetype.cpp
+2 -2
View File
@@ -436,7 +436,7 @@ void ImGui_ImplFreeType_FontSrcDestroy(ImFontAtlas* atlas, ImFontConfig* src)
bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src) bool ImGui_ImplFreeType_FontBakedInit(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src)
{ {
IM_UNUSED(atlas); IM_UNUSED(atlas);
const float size = baked->Size * (src->SizePixels / baked->ContainerFont->Sources[0].SizePixels); // FIXME-NEWATLAS: Should tidy up that a bit const float size = baked->Size * (src->SizePixels / baked->ContainerFont->Sources[0]->SizePixels); // FIXME-NEWATLAS: Should tidy up that a bit
ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData; ImGui_ImplFreeType_FontSrcData* bd_font_data = (ImGui_ImplFreeType_FontSrcData*)src->FontLoaderData;
bd_font_data->BakedLastActivated = baked; bd_font_data->BakedLastActivated = baked;
@@ -541,7 +541,7 @@ ImFontGlyph* ImGui_ImplFreeType_FontBakedLoadGlyph(ImFontAtlas* atlas, ImFontCon
uint32_t* temp_buffer = (uint32_t*)atlas->Builder->TempBuffer.Data; uint32_t* temp_buffer = (uint32_t*)atlas->Builder->TempBuffer.Data;
bd_font_data->BlitGlyph(ft_bitmap, temp_buffer, w); bd_font_data->BlitGlyph(ft_bitmap, temp_buffer, w);
const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0].SizePixels; const float offsets_scale = baked->Size / baked->ContainerFont->Sources[0]->SizePixels;
float font_off_x = (src->GlyphOffset.x * offsets_scale); float font_off_x = (src->GlyphOffset.x * offsets_scale);
float font_off_y = (src->GlyphOffset.y * offsets_scale) + baked->Ascent; float font_off_y = (src->GlyphOffset.y * offsets_scale) + baked->Ascent;
if (src->PixelSnapH) // Snap scaled offset. This is to mitigate backward compatibility issues for GlyphOffset, but a better design would be welcome. if (src->PixelSnapH) // Snap scaled offset. This is to mitigate backward compatibility issues for GlyphOffset, but a better design would be welcome.