From 0e159aa22e0f2dfc41716af199d3454d2e555196 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 21 Feb 2015 10:10:21 +0000 Subject: [PATCH] BeginChild() variant goes after the main one --- imgui.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 88cc36dd..11f34fd5 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -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();