mirror of
https://github.com/Drezil/imgui.git
synced 2025-03-29 23:42:44 +00:00
BeginChild() variant goes after the main one
This commit is contained in:
parent
2ae0e667d0
commit
0e159aa22e
14
imgui.cpp
14
imgui.cpp
@ -2494,13 +2494,6 @@ void ImGui::EndTooltip()
|
|||||||
ImGui::End();
|
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)
|
void ImGui::BeginChild(const char* str_id, ImVec2 size, bool border, ImGuiWindowFlags extra_flags)
|
||||||
{
|
{
|
||||||
ImGuiState& g = *GImGui;
|
ImGuiState& g = *GImGui;
|
||||||
@ -2536,6 +2529,13 @@ void ImGui::BeginChild(const char* str_id, ImVec2 size, bool border, ImGuiWindow
|
|||||||
g.CurrentWindow->Flags &= ~ImGuiWindowFlags_ShowBorders;
|
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()
|
void ImGui::EndChild()
|
||||||
{
|
{
|
||||||
ImGuiWindow* window = GetCurrentWindow();
|
ImGuiWindow* window = GetCurrentWindow();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user