mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-25 02:24:24 +00:00
Code Activity

Merge branch 'viewport' into docking

Browse source 
# Conflicts:
#	docs/TODO.txt
This commit is contained in:
omar 2019-01-15 15:14:16 +01:00
commit 515ad62335
4 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
imgui.cpp
View file

@ -4573,7 +4573,8 @@ static bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size
// Set the cursor to handle case where the user called SetNextWindowPos()+BeginChild() manually.
// While this is not really documented/defined, it seems that the expected thing to do.
parent_window->DC.CursorPos = child_window->Pos;
if (child_window->BeginCount == 1)
parent_window->DC.CursorPos = child_window->Pos;
// Process navigation-in immediately so NavInit can run on first frame
if (g.NavActivateId == id && !(flags & ImGuiWindowFlags_NavFlattened) && (child_window->DC.NavLayerActiveMask != 0 || child_window->DC.NavHasScroll))