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

Fonts: no need to load current baked on SkipItems window? + removed unused field.

Browse source 
Avoid baked staying active after GC. Might cause issues.

# Conflicts:
#	imgui.cpp
This commit is contained in:
ocornut 2025-04-17 15:00:35 +02:00
parent cdfa537adf
commit c43b138a69
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
imgui.cpp
View file

@ -8625,9 +8625,13 @@ void ImGui::SetCurrentFont(ImFont* font, float font_size)
void ImGui::UpdateCurrentFontSize()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
if (window != NULL && window->SkipItems)
return;
float final_size = g.FontSizeBeforeScaling * g.IO.FontGlobalScale;
final_size *= g.Font->Scale;
if (ImGuiWindow* window = g.CurrentWindow)
if (window != NULL)
final_size *= window->FontWindowScale;
// Round font size

1
imgui_internal.h
View file

@ -2144,7 +2144,6 @@ struct ImGuiContext
float FontScale; // == FontBaked->Size / Font->FontSize. Scale factor over baked size.
float CurrentDpiScale; // Current window/viewport DpiScale == CurrentViewport->DpiScale
ImDrawListSharedData DrawListSharedData;
ImVector<ImTextureData*>Textures;
double Time;
int FrameCount;
int FrameCountEnded;