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

Merge branch 'master' into viewport

Browse Source
This commit is contained in:
omar
2019-01-15 15:13:29 +01:00
parent e24674fc0e d38d7c6628
commit 73353fad64
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imgui.cpp
View File

@@ -4477,7 +4477,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))