Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-02-02 20:47:23 +01:00
Code Releases Wiki Activity

Fonts: Allowing PushFont()/PopFont() to be called outside the imgui frame scope. (#3621)

Browse Source
This commit is contained in:
ocornut 2024-12-20 17:17:40 +01:00
parent d30e102f3a
commit 61d4bf95dc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGELOG.txt
View File

@ -58,6 +58,7 @@ Other changes:
yourself based on your own logic. (#8223) yourself based on your own logic. (#8223)
- Nav: Fixed an issue where Alt key would clear current active item on - Nav: Fixed an issue where Alt key would clear current active item on
windows with the ImGuiWindowFlags_NoNavInputs flag. (#8231) windows with the ImGuiWindowFlags_NoNavInputs flag. (#8231)
- Fonts: Allowing PushFont()/PopFont() to be called outside the imgui frame scope. (#3621)
- Debug Tools: Debug Log: hovering 0xXXXXXXXX values in log is allowed even - Debug Tools: Debug Log: hovering 0xXXXXXXXX values in log is allowed even
if a popup is blocking mouse access to the debug log window. (#5855) if a popup is blocking mouse access to the debug log window. (#5855)
- Backends: Vulkan: Fixed setting VkSwapchainCreateInfoKHR::preTransform for - Backends: Vulkan: Fixed setting VkSwapchainCreateInfoKHR::preTransform for

6
imgui.cpp
View File

@ -8018,7 +8018,8 @@ void ImGui::PushFont(ImFont* font)
font = GetDefaultFont(); font = GetDefaultFont();
g.FontStack.push_back(font); g.FontStack.push_back(font);
SetCurrentFont(font); SetCurrentFont(font);
g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID); if (ImGuiWindow* window = g.CurrentWindow)
window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
} }
void ImGui::PopFont() void ImGui::PopFont()
@ -8032,7 +8033,8 @@ void ImGui::PopFont()
g.FontStack.pop_back(); g.FontStack.pop_back();
ImFont* font = g.FontStack.Size == 0 ? GetDefaultFont() : g.FontStack.back(); ImFont* font = g.FontStack.Size == 0 ? GetDefaultFont() : g.FontStack.back();
SetCurrentFont(font); SetCurrentFont(font);
g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID); if (ImGuiWindow* window = g.CurrentWindow)
window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
} }
void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled) void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled)