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

Merge branch 'master' into docking
build / Windows (push) Has been cancelled
Details
build / Linux (push) Has been cancelled
Details
build / MacOS (push) Has been cancelled
Details
build / iOS (push) Has been cancelled
Details
build / Emscripten (push) Has been cancelled
Details
build / Android (push) Has been cancelled
Details

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_vulkan.cpp
This commit is contained in:
ocornut
2025-07-08 17:25:22 +02:00
parent ee8fd5325a ed7d965818
commit c99ac2451f
13 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui_draw.cpp
+4 -4
View File
@@ -3416,6 +3416,9 @@ void ImFontAtlasBuildSetupFontLoader(ImFontAtlas* atlas, const ImFontLoader* fon
atlas->FontLoader->LoaderInit(atlas);
for (ImFont* font : atlas->Fonts)
ImFontAtlasFontInitOutput(atlas, font);
for (ImFont* font : atlas->Fonts)
for (ImFontConfig* src : font->Sources)
ImFontAtlasFontSourceAddToFont(atlas, font, src);
}
// Preload all glyph ranges for legacy backends.
@@ -3582,11 +3585,8 @@ bool ImFontAtlasFontInitOutput(ImFontAtlas* atlas, ImFont* font)
{
bool ret = true;
for (ImFontConfig* src : font->Sources)
{
const ImFontLoader* loader = src->FontLoader ? src->FontLoader : atlas->FontLoader;
if (loader && loader->FontSrcInit != NULL && !loader->FontSrcInit(atlas, src))
if (!ImFontAtlasFontSourceInit(atlas, src))
ret = false;
}
IM_ASSERT(ret); // Unclear how to react to this meaningfully. Assume that result will be same as initial AddFont() call.
return ret;
}