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

Combo box always appear above other child windows of a same parent

Browse Source
This commit is contained in:
ocornut 2015-02-08 17:21:51 +00:00
parent c907108c23
commit f387c3f22f
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
imgui.cpp
View File

@ -267,7 +267,6 @@
- columns: columns header to act as button (~sort op) and allow resize/reorder - columns: columns header to act as button (~sort op) and allow resize/reorder
- columns: user specify columns size - columns: user specify columns size
- combo: turn child handling code into pop up helper - combo: turn child handling code into pop up helper
- combo: layer conflict with other child windows
- combo: contents should extends to fit label if combo widget is small - combo: contents should extends to fit label if combo widget is small
- list selection, concept of a selectable "block" (that can be multiple widgets) - list selection, concept of a selectable "block" (that can be multiple widgets)
! menubar, menus ! menubar, menus
@ -1485,7 +1484,7 @@ void ImGuiWindow::AddToRenderList()
for (size_t i = 0; i < DC.ChildWindows.size(); i++) for (size_t i = 0; i < DC.ChildWindows.size(); i++)
{ {
ImGuiWindow* child = DC.ChildWindows[i]; ImGuiWindow* child = DC.ChildWindows[i];
if (child->Visible) // clipped childs may have been marked not Visible if (child->Visible) // clipped children may have been marked not Visible
child->AddToRenderList(); child->AddToRenderList();
} }
} }
@ -1859,12 +1858,27 @@ void ImGui::Shutdown()
g.Initialized = false; g.Initialized = false;
} }
// FIXME: Add a more explicit sort order in the window structure.
static int ChildWindowComparer(const void* lhs, const void* rhs)
{
const ImGuiWindow* a = *(const ImGuiWindow**)lhs;
const ImGuiWindow* b = *(const ImGuiWindow**)rhs;
if (int d = (a->Flags & ImGuiWindowFlags_Tooltip) - (b->Flags & ImGuiWindowFlags_Tooltip))
return d;
if (int d = (a->Flags & ImGuiWindowFlags_ComboBox) - (b->Flags & ImGuiWindowFlags_ComboBox))
return d;
return 0;
}
static void AddWindowToSortedBuffer(ImGuiWindow* window, ImVector<ImGuiWindow*>& sorted_windows) static void AddWindowToSortedBuffer(ImGuiWindow* window, ImVector<ImGuiWindow*>& sorted_windows)
{ {
sorted_windows.push_back(window); sorted_windows.push_back(window);
if (window->Visible) if (window->Visible)
{ {
for (size_t i = 0; i < window->DC.ChildWindows.size(); i++) const size_t count = window->DC.ChildWindows.size();
if (count > 1)
qsort(window->DC.ChildWindows.begin(), count, sizeof(ImGuiWindow*), ChildWindowComparer);
for (size_t i = 0; i < count; i++)
{ {
ImGuiWindow* child = window->DC.ChildWindows[i]; ImGuiWindow* child = window->DC.ChildWindows[i];
if (child->Visible) if (child->Visible)
@ -1912,7 +1926,7 @@ void ImGui::Render()
g.CurrentWindow->Visible = false; g.CurrentWindow->Visible = false;
ImGui::End(); ImGui::End();
// Select window for move/focus when we're done with all our widgets (we only consider non-childs windows here) // Select window for move/focus when we're done with all our widgets (we only consider non-child windows here)
if (g.ActiveId == 0 && g.HoveredId == 0 && g.HoveredRootWindow != NULL && g.IO.MouseClicked[0]) if (g.ActiveId == 0 && g.HoveredId == 0 && g.HoveredRootWindow != NULL && g.IO.MouseClicked[0])
SetActiveId(g.HoveredRootWindow->GetID("#MOVE")); SetActiveId(g.HoveredRootWindow->GetID("#MOVE"));
@ -1928,7 +1942,7 @@ void ImGui::Render()
continue; continue;
AddWindowToSortedBuffer(window, g.RenderSortedWindows); AddWindowToSortedBuffer(window, g.RenderSortedWindows);
} }
IM_ASSERT(g.Windows.size() == g.RenderSortedWindows.size()); // We done something wrong IM_ASSERT(g.Windows.size() == g.RenderSortedWindows.size()); // we done something wrong
g.Windows.swap(g.RenderSortedWindows); g.Windows.swap(g.RenderSortedWindows);
// Clear data for next frame // Clear data for next frame