mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into docking

Browse source
This commit is contained in:
ocornut 2025-06-24 19:10:26 +02:00
commit e4bba0b53c
9 changed files with 58 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui_draw.cpp
View file

@ -5233,7 +5233,7 @@ ImFontBaked* ImFont::GetFontBaked(float size, float density)
ImFontBaked* baked = LastBaked;
// Round font size
// - ImGui::PushFontSize() will already round, but other paths calling GetFontBaked() directly also needs it (e.g. ImFontAtlasBuildPreloadAllGlyphRanges)
// - ImGui::PushFont() will already round, but other paths calling GetFontBaked() directly also needs it (e.g. ImFontAtlasBuildPreloadAllGlyphRanges)
size = ImGui::GetRoundedFontSize(size);
if (density < 0.0f)
@ -5711,7 +5711,7 @@ begin:
}
// Edge case: calling RenderText() with unloaded glyphs triggering texture change. It doesn't happen via ImGui:: calls because CalcTextSize() is always used.
if (cmd_count != draw_list->CmdBuffer.Size)
if (cmd_count != draw_list->CmdBuffer.Size) //-V547
{
IM_ASSERT(draw_list->CmdBuffer[draw_list->CmdBuffer.Size - 1].ElemCount == 0);
draw_list->CmdBuffer.pop_back();