File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ Other changes:
58
58
yourself based on your own logic. (#8223)
59
59
- Nav: Fixed an issue where Alt key would clear current active item on
60
60
windows with the ImGuiWindowFlags_NoNavInputs flag. (#8231)
61
+ - Fonts: Allowing PushFont()/PopFont() to be called outside the imgui frame scope. (#3621)
61
62
- Debug Tools: Debug Log: hovering 0xXXXXXXXX values in log is allowed even
62
63
if a popup is blocking mouse access to the debug log window. (#5855)
63
64
- Backends: Vulkan: Fixed setting VkSwapchainCreateInfoKHR::preTransform for
Original file line number Diff line number Diff line change @@ -8018,7 +8018,8 @@ void ImGui::PushFont(ImFont* font)
8018
8018
font = GetDefaultFont();
8019
8019
g.FontStack.push_back(font);
8020
8020
SetCurrentFont(font);
8021
- g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
8021
+ if (ImGuiWindow* window = g.CurrentWindow)
8022
+ window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
8022
8023
}
8023
8024
8024
8025
void ImGui::PopFont()
@@ -8032,7 +8033,8 @@ void ImGui::PopFont()
8032
8033
g.FontStack.pop_back();
8033
8034
ImFont* font = g.FontStack.Size == 0 ? GetDefaultFont() : g.FontStack.back();
8034
8035
SetCurrentFont(font);
8035
- g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
8036
+ if (ImGuiWindow* window = g.CurrentWindow)
8037
+ window->DrawList->_SetTextureID(font->ContainerAtlas->TexID);
8036
8038
}
8037
8039
8038
8040
void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled)
You can’t perform that action at this time.
0 commit comments