mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-07 04:30:08 +00:00
Code Activity

Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.

Browse source
This commit is contained in:
omar 2018-12-21 16:53:56 +01:00
parent e181b0c3fc
commit 238321c159
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
imgui.cpp
View file

@ -3734,11 +3734,11 @@ void ImGui::PopClipRect()
window->ClipRect = window->DrawList->_ClipRectStack.back();
}
static ImGuiWindow* FindFromMostVisibleChildWindow(ImGuiWindow* window)
static ImGuiWindow* FindFrontMostVisibleChildWindow(ImGuiWindow* window)
{
for (int n = window->DC.ChildWindows.Size - 1; n >= 0; n--)
if (IsWindowActiveAndVisible(window->DC.ChildWindows[n]))
return FindFromMostVisibleChildWindow(window->DC.ChildWindows[n]);
return FindFrontMostVisibleChildWindow(window->DC.ChildWindows[n]);
return window;
}
@ -3792,7 +3792,7 @@ void ImGui::EndFrame()
{
// Choose a draw list that will be front-most across all our children
ImGuiWindow* window = g.NavWindowingTargetAnim;
ImDrawList* draw_list = FindFromMostVisibleChildWindow(window->RootWindow)->DrawList;
ImDrawList* draw_list = FindFrontMostVisibleChildWindow(window->RootWindow)->DrawList;
draw_list->PushClipRectFullScreen();
// Docking: draw modal whitening background on other nodes of a same dock tree