Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Popups: fixed child windows within popups vs handling of sub menus. Added examples.

Browse Source
This commit is contained in:
ocornut 2015-05-15 11:30:51 +01:00
parent 748072c045
commit d9b2a90773
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
imgui.cpp
View File

@ -1149,6 +1149,14 @@ struct ImGuiMouseCursorData
ImVec2 TexUvMax[2]; ImVec2 TexUvMax[2];
}; };
struct ImGuiPopupRef
{
ImGuiID PopupID; // Set on OpenPopup()
ImGuiWindow* Window; // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup()
ImGuiPopupRef(ImGuiID id) { PopupID = id; Window = NULL; }
};
// Main state for ImGui // Main state for ImGui
struct ImGuiState struct ImGuiState
{ {
@ -1183,8 +1191,8 @@ struct ImGuiState
ImVector<ImGuiColMod> ColorModifiers; ImVector<ImGuiColMod> ColorModifiers;
ImVector<ImGuiStyleMod> StyleModifiers; ImVector<ImGuiStyleMod> StyleModifiers;
ImVector<ImFont*> FontStack; ImVector<ImFont*> FontStack;
ImVector<ImGuiID> OpenedPopupStack; // Which popups are open ImVector<ImGuiPopupRef> OpenedPopupStack; // Which popups are open
ImVector<ImGuiID> CurrentPopupStack; // Which level of BeginPopup() we are in (reset every frame) ImVector<ImGuiPopupRef> CurrentPopupStack; // Which level of BeginPopup() we are in (reset every frame)
ImVec2 SetNextWindowPosVal; ImVec2 SetNextWindowPosVal;
ImGuiSetCond SetNextWindowPosCond; ImGuiSetCond SetNextWindowPosCond;
@ -2132,12 +2140,16 @@ static void CloseInactivePopups()
return; return;
} }
// When popups are stacked, clicking on a lower level popups puts focus back to it and close its child // When popups are stacked, clicking on a lower level popups puts focus back to it and close popups above it
IM_ASSERT(g.FocusedWindow->PopupID != 0); IM_ASSERT(g.FocusedWindow->RootWindow->PopupID != 0);
for (size_t n = 0; n < g.OpenedPopupStack.size(); n++) for (int n = 0; n < (int)g.OpenedPopupStack.size()-1; n++)
if (g.OpenedPopupStack[n] == g.FocusedWindow->PopupID) if (g.OpenedPopupStack[n].PopupID == g.FocusedWindow->RootWindow->PopupID)
{ {
g.OpenedPopupStack.resize(n+1); // Don't close our own Child Popup windows
while (++n < (int)g.OpenedPopupStack.size())
if (!g.OpenedPopupStack[n].Window || !(g.OpenedPopupStack[n].Window->Flags & ImGuiWindowFlags_ChildWindow))
break;
g.OpenedPopupStack.resize(n);
return; return;
} }
} }
@ -2975,9 +2987,9 @@ void ImGui::OpenPopup(const char* str_id)
// One open popup per level of the popup hierarchy // One open popup per level of the popup hierarchy
if (g.OpenedPopupStack.size() == g.CurrentPopupStack.size()) if (g.OpenedPopupStack.size() == g.CurrentPopupStack.size())
g.OpenedPopupStack.push_back(id); g.OpenedPopupStack.push_back(ImGuiPopupRef(id));
else if (g.OpenedPopupStack.size() == g.CurrentPopupStack.size() + 1) else if (g.OpenedPopupStack.size() == g.CurrentPopupStack.size() + 1)
g.OpenedPopupStack.back() = id; g.OpenedPopupStack.back() = ImGuiPopupRef(id);
else else
IM_ASSERT(0); // Invalid state IM_ASSERT(0); // Invalid state
} }
@ -2985,9 +2997,9 @@ void ImGui::OpenPopup(const char* str_id)
void ImGui::CloseCurrentPopup() void ImGui::CloseCurrentPopup()
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
if (g.CurrentPopupStack.empty() || g.OpenedPopupStack.empty() || g.CurrentPopupStack.back() != g.OpenedPopupStack.back()) if (g.CurrentPopupStack.empty() || g.OpenedPopupStack.empty() || g.CurrentPopupStack.back().PopupID != g.OpenedPopupStack.back().PopupID)
return; return;
if (g.Windows.back()->PopupID == g.OpenedPopupStack.back() && g.Windows.size() >= 2) if (g.Windows.back()->PopupID == g.OpenedPopupStack.back().PopupID && g.Windows.size() >= 2)
FocusWindow(g.Windows[g.Windows.size()-2]); FocusWindow(g.Windows[g.Windows.size()-2]);
g.OpenedPopupStack.pop_back(); g.OpenedPopupStack.pop_back();
} }
@ -3003,7 +3015,7 @@ static void CloseAllPopups()
static bool IsPopupOpen(ImGuiID id) static bool IsPopupOpen(ImGuiID id)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
const bool opened = g.OpenedPopupStack.size() > g.CurrentPopupStack.size() && g.OpenedPopupStack[g.CurrentPopupStack.size()] == id; const bool opened = g.OpenedPopupStack.size() > g.CurrentPopupStack.size() && g.OpenedPopupStack[g.CurrentPopupStack.size()].PopupID == id;
return opened; return opened;
} }
@ -3291,10 +3303,11 @@ bool ImGui::Begin(const char* name, bool* p_opened, const ImVec2& size_on_first_
bool window_was_visible = (window->LastFrameDrawn == current_frame - 1); // Not using !WasActive because the implicit "Debug" window would always toggle off->on bool window_was_visible = (window->LastFrameDrawn == current_frame - 1); // Not using !WasActive because the implicit "Debug" window would always toggle off->on
if (flags & ImGuiWindowFlags_Popup) if (flags & ImGuiWindowFlags_Popup)
{ {
const ImGuiID popup_id = g.OpenedPopupStack[g.CurrentPopupStack.size()]; ImGuiPopupRef& popup_ref = g.OpenedPopupStack[g.CurrentPopupStack.size()];
g.CurrentPopupStack.push_back(popup_id); window_was_visible &= (window->PopupID == popup_ref.PopupID);
window_was_visible &= (window->PopupID == popup_id); popup_ref.Window = window;
window->PopupID = popup_id; g.CurrentPopupStack.push_back(popup_ref);
window->PopupID = popup_ref.PopupID;
} }
// Process SetNextWindow***() calls // Process SetNextWindow***() calls
@ -10237,7 +10250,7 @@ void ImGui::ShowTestWindow(bool* opened)
ImGui::MenuItem(names[i], "", &toggles[i]); ImGui::MenuItem(names[i], "", &toggles[i]);
if (ImGui::BeginMenu("Sub-menu")) if (ImGui::BeginMenu("Sub-menu"))
{ {
ImGui::MenuItem("Hello"); ImGui::MenuItem("Click me");
ImGui::EndMenu(); ImGui::EndMenu();
} }
@ -10284,6 +10297,10 @@ void ImGui::ShowTestWindow(bool* opened)
static bool enabled = true; static bool enabled = true;
static float f = 0.5f; static float f = 0.5f;
ImGui::MenuItem("Enabled", "", &enabled); ImGui::MenuItem("Enabled", "", &enabled);
ImGui::BeginChild("child", ImVec2(0, 60), true);
for (int i = 0; i < 10; i++)
ImGui::Text("Scrolling Text %d", i);
ImGui::EndChild();
ImGui::SliderFloat("Value", &f, 0.0f, 1.0f); ImGui::SliderFloat("Value", &f, 0.0f, 1.0f);
ImGui::EndMenu(); ImGui::EndMenu();
} }