Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki 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
parent ff4bd758ca 73353fad64
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))