organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-04 21:15:09 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

WIP - Allow PushFont/NewFrame/PopFont idioms to function.

Browse source
This commit is contained in:
ocornut 2025-02-03 19:15:26 +01:00
parent c59cfc6302
commit ea3b921611
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
imgui.cpp
View file

@ -5391,6 +5391,8 @@ static void SetupDrawListSharedData()
g.DrawListSharedData.InitialFringeScale = 1.0f; // FIXME-DPI: Change this for some DPI scaling experiments.
}
static void PushDefaultFont();
void ImGui::NewFrame()
{
IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
@ -5440,7 +5442,7 @@ void ImGui::NewFrame()
if ((g.IO.BackendFlags & ImGuiBackendFlags_RendererHasTextures) == 0)
atlas->Locked = true;
SetupDrawListSharedData();
PushFont(GetDefaultFont(), GetDefaultFont()->Sources[0].SizePixels);
PushDefaultFont();
IM_ASSERT(g.Font->IsLoaded());
g.WithinFrameScope = true;
@ -8520,6 +8522,16 @@ void ImGui::PushFont(ImFont* font, float font_size)
SetCurrentFont(font, font_size);
}
// NewFrame() calls this and we do this really unusual thing of calling *push_front()*, the reason behind that we want to support the PushFont()/NewFrame()/PopFont() idiom.
static void PushDefaultFont()
{
ImGuiContext& g = *GImGui;
ImFontStackData font_stack_data = { ImGui::GetDefaultFont(), ImGui::GetDefaultFont()->Sources[0].SizePixels };
g.FontStack.push_front(font_stack_data);
if (g.FontStack.Size == 1)
ImGui::SetCurrentFont(font_stack_data.Font, font_stack_data.FontSize);
}
void ImGui::PopFont()
{
ImGuiContext& g = *GImGui;