BeginChild() variant goes after the main one

This commit is contained in:
ocornut 2015-02-21 10:10:21 +00:00
parent 2ae0e667d0
commit 0e159aa22e

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();