mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 08:49:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Popup auto-border doesn't spread to its childs #197

Browse Source
This commit is contained in:
ocornut 2015-05-03 13:04:43 +01:00
parent a3a10d4a3c
commit 0ca7926b94
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui.cpp
View File

@ -2874,12 +2874,16 @@ void ImGui::EndTooltip()
void ImGui::BeginPopup(bool* p_opened) void ImGui::BeginPopup(bool* p_opened)
{ {
ImGuiWindow* window = GetCurrentWindow();
IM_ASSERT(p_opened != NULL); // Must provide a bool at the moment IM_ASSERT(p_opened != NULL); // Must provide a bool at the moment
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
ImGuiWindowFlags flags = ImGuiWindowFlags_Popup|ImGuiWindowFlags_ShowBorders|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize; ImGuiWindowFlags flags = ImGuiWindowFlags_Popup|ImGuiWindowFlags_ShowBorders|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize;
float alpha = 1.0f; float alpha = 1.0f;
ImGui::Begin("##Popup", p_opened, ImVec2(0.0f, 0.0f), alpha, flags); ImGui::Begin("##Popup", p_opened, ImVec2(0.0f, 0.0f), alpha, flags);
if (!(window->Flags & ImGuiWindowFlags_ShowBorders))
GetCurrentWindow()->Flags &= ~ImGuiWindowFlags_ShowBorders;
} }
void ImGui::EndPopup() void ImGui::EndPopup()
@ -2922,7 +2926,7 @@ bool ImGui::BeginChild(const char* str_id, const ImVec2& size_arg, bool border,
bool ret = ImGui::Begin(title, NULL, size, alpha, flags); bool ret = ImGui::Begin(title, NULL, size, alpha, flags);
if (!(window->Flags & ImGuiWindowFlags_ShowBorders)) if (!(window->Flags & ImGuiWindowFlags_ShowBorders))
g.CurrentWindow->Flags &= ~ImGuiWindowFlags_ShowBorders; GetCurrentWindow()->Flags &= ~ImGuiWindowFlags_ShowBorders;
return ret; return ret;
} }