Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-10-31 05:01:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

ImDrawList, Font: Fixed bug introduced in 531c11d5c7 (#1519)

Browse Source
This commit is contained in:
omar
2017-12-22 20:19:48 +01:00
parent c8c872c753
commit 8d21ee56d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@@ -1922,7 +1922,7 @@ static void SetCurrentWindow(ImGuiWindow* window)
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
g.CurrentWindow = window; g.CurrentWindow = window;
if (window) if (window)
g.FontSize = window->CalcFontSize(); g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
} }
void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window) void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
@@ -5843,7 +5843,7 @@ void ImGui::SetWindowFontScale(float scale)
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
window->FontWindowScale = scale; window->FontWindowScale = scale;
g.FontSize = window->CalcFontSize(); g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
} }
// User generally sees positions in window coordinates. Internally we store CursorPos in absolute screen coordinates because it is more convenient. // User generally sees positions in window coordinates. Internally we store CursorPos in absolute screen coordinates because it is more convenient.