mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-15 06:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

DrawList, Fonts: fixed PushFont()/AddImage() not restoring correct atlas texture id when using multiple atlas (#8694)

Browse Source 
This also needs 24f7328.
This commit is contained in:
ocornut
2025-06-17 11:56:43 +02:00
parent 24f7328e5f
commit fe048efeab
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CHANGELOG.txt
View File

@@ -161,6 +161,9 @@ Breaking changes:
- renamed ImGuiFreeType::GetBuilderForFreeType() to ImGuiFreeType::GetFontLoader() - renamed ImGuiFreeType::GetBuilderForFreeType() to ImGuiFreeType::GetFontLoader()
- old: io.Fonts->FontBuilderIO = ImGuiFreeType::GetBuilderForFreeType() - old: io.Fonts->FontBuilderIO = ImGuiFreeType::GetBuilderForFreeType()
- new: io.Fonts.FontLoader = ImGuiFreeType::GetFontLoader(); - new: io.Fonts.FontLoader = ImGuiFreeType::GetFontLoader();
- DrawList: Fixed a regression from 1.91.1 where a Begin()/PushFont()/AddImage() sequence
would not restore the correct atlas Texture Identifier when the PushFont() call used
a font from a different atlas. (#8694, caused by #3224, #3875, #6398, #7903)
- DrawList: Renamed ImDrawList::PushTextureID()/PopTextureID() to PushTexture()/PopTexture(). - DrawList: Renamed ImDrawList::PushTextureID()/PopTextureID() to PushTexture()/PopTexture().
- Fonts: (users of custom rectangles) - Fonts: (users of custom rectangles)
- Renamed AddCustomRectRegular() to AddCustomRect(). (#8466) - Renamed AddCustomRectRegular() to AddCustomRect(). (#8466)

1
imgui_draw.cpp
View File

@@ -695,6 +695,7 @@ void ImDrawList::_SetTexture(ImTextureRef tex_ref)
if (_CmdHeader.TexRef == tex_ref) if (_CmdHeader.TexRef == tex_ref)
return; return;
_CmdHeader.TexRef = tex_ref; _CmdHeader.TexRef = tex_ref;
_TextureStack.back() = tex_ref;
_OnChangedTexture(); _OnChangedTexture();
} }