mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Fonts: no need to load current baked on SkipItems window? + removed unused field.
Avoid baked staying active after GC. Might cause issues. # Conflicts: # imgui.cpp
This commit is contained in:
parent
cdfa537adf
commit
c43b138a69
2 changed files with 5 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue