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

Fonts: fixed NewFrame() when atlas builder has been created but fonts not added. Fixed GetCustomRect() after atlas clear.

Browse Source
This commit is contained in:
ocornut
2025-06-11 13:20:17 +02:00
parent 29fbf3c1ec
commit e1481a731d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui.cpp
+1 -1
View File
@@ -8668,7 +8668,7 @@ ImFont* ImGui::GetDefaultFont()
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImFontAtlas* atlas = g.IO.Fonts; ImFontAtlas* atlas = g.IO.Fonts;
if (atlas->Builder == NULL) if (atlas->Builder == NULL || atlas->Fonts.Size == 0)
ImFontAtlasBuildMain(atlas); ImFontAtlasBuildMain(atlas);
return g.IO.FontDefault ? g.IO.FontDefault : atlas->Fonts[0]; return g.IO.FontDefault ? g.IO.FontDefault : atlas->Fonts[0];
} }
imgui_draw.cpp
+2
View File
@@ -4362,6 +4362,8 @@ ImTextureRect* ImFontAtlasPackGetRectSafe(ImFontAtlas* atlas, ImFontAtlasRectId
if (id == ImFontAtlasRectId_Invalid) if (id == ImFontAtlasRectId_Invalid)
return NULL; return NULL;
int index_idx = ImFontAtlasRectId_GetIndex(id); int index_idx = ImFontAtlasRectId_GetIndex(id);
if (atlas->Builder == NULL)
ImFontAtlasBuildInit(atlas);
ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder; ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder;
if (index_idx >= builder->RectsIndex.Size) if (index_idx >= builder->RectsIndex.Size)
return NULL; return NULL;