Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-05-29 04:46:11 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 61d4bf95dc.
This commit is contained in:
ocornut
2024-12-20 17:20:57 +01:00
parent 61d4bf95dc
commit 7219fa65c0
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/CHANGELOG.txt
-1
View File
@@ -58,7 +58,6 @@ 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
imgui.cpp
+2 -4
View File
@@ -8018,8 +8018,7 @@ void ImGui::PushFont(ImFont* font)
font = GetDefaultFont(); font = GetDefaultFont();
g.FontStack.push_back(font); g.FontStack.push_back(font);
SetCurrentFont(font); SetCurrentFont(font);
if (ImGuiWindow* window = g.CurrentWindow) g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
} }
void ImGui::PopFont() void ImGui::PopFont()
@@ -8033,8 +8032,7 @@ 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);
if (ImGuiWindow* window = g.CurrentWindow) g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
} }
void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled) void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled)