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

Fonts: fixed an issue calling legacy ImFontAtlas::Clear().

Browse Source
This commit is contained in:
ocornut
2025-03-11 19:54:33 +01:00
committed by ocornut
parent 144f444217
commit 7ac1bff482
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui_draw.cpp
+5 -5
View File
@@ -2637,8 +2637,6 @@ void ImFontAtlas::Clear()
RendererHasTextures = false; // Full Clear() is supported, but ClearTexData() only isn't. RendererHasTextures = false; // Full Clear() is supported, but ClearTexData() only isn't.
ClearFonts(); ClearFonts();
ClearTexData(); ClearTexData();
if (Builder != NULL)
ImFontAtlasBuildClearTexture(this);
RendererHasTextures = backup_renderer_has_textures; RendererHasTextures = backup_renderer_has_textures;
} }
@@ -3374,8 +3372,6 @@ void ImFontAtlasBuildSetupFontLoader(ImFontAtlas* atlas, const ImFontLoader* fon
atlas->FontLoader = font_loader; atlas->FontLoader = font_loader;
atlas->FontLoaderName = font_loader ? font_loader->Name : "NULL"; atlas->FontLoaderName = font_loader ? font_loader->Name : "NULL";
if (atlas->FontLoader && atlas->FontLoader->LoaderInit)
atlas->FontLoader->LoaderInit(atlas);
ImFontAtlasBuildAddTexture(atlas, new_tex_size.x, new_tex_size.y); ImFontAtlasBuildAddTexture(atlas, new_tex_size.x, new_tex_size.y);
ImFontAtlasBuildInit(atlas); ImFontAtlasBuildInit(atlas);
@@ -4140,8 +4136,12 @@ void ImFontAtlasBuildInit(ImFontAtlas* atlas)
return; // ImFontAtlasBuildSetupFontLoader() automatically call ImFontAtlasBuildInit() return; // ImFontAtlasBuildSetupFontLoader() automatically call ImFontAtlasBuildInit()
} }
IM_ASSERT(atlas->FontLoaderData == NULL);
if (atlas->FontLoader && atlas->FontLoader->LoaderInit)
atlas->FontLoader->LoaderInit(atlas);
// Create initial texture size // Create initial texture size
if (atlas->TexData == NULL) if (atlas->TexData == NULL || atlas->TexData->Pixels == NULL)
ImFontAtlasBuildAddTexture(atlas, ImUpperPowerOfTwo(atlas->TexMinWidth), ImUpperPowerOfTwo(atlas->TexMinHeight)); ImFontAtlasBuildAddTexture(atlas, ImUpperPowerOfTwo(atlas->TexMinWidth), ImUpperPowerOfTwo(atlas->TexMinHeight));
ImFontAtlasBuilder* builder = atlas->Builder; // Do not move above ImFontAtlasBuilder* builder = atlas->Builder; // Do not move above