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

BeginChild() variant goes after the main one

Browse Source
This commit is contained in:
ocornut
2015-02-21 10:10:21 +00:00
parent 2ae0e667d0
commit 0e159aa22e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
imgui.cpp
View File

@@ -2494,13 +2494,6 @@ void ImGui::EndTooltip()
ImGui::End();
}
void ImGui::BeginChild(ImGuiID id, ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
{
char str_id[32];
ImFormatString(str_id, IM_ARRAYSIZE(str_id), "child_%x", id);
ImGui::BeginChild(str_id, size, border, extra_flags);
}
void ImGui::BeginChild(const char* str_id, ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
{
ImGuiState& g = *GImGui;
@@ -2536,6 +2529,13 @@ void ImGui::BeginChild(const char* str_id, ImVec2 size, bool border, ImGuiWindow
g.CurrentWindow->Flags &= ~ImGuiWindowFlags_ShowBorders;
}
void ImGui::BeginChild(ImGuiID id, ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
{
char str_id[32];
ImFormatString(str_id, IM_ARRAYSIZE(str_id), "child_%x", id);
ImGui::BeginChild(str_id, size, border, extra_flags);
}
void ImGui::EndChild()
{
ImGuiWindow* window = GetCurrentWindow();