commit b8c6e31c2de36d80ed16af54b80ae8e489964f84
author omar <omarcornut@gmail.com> Tue Jan 15 15:05:56 2019 +0100
committer omar <omarcornut@gmail.com> Tue Jan 15 15:05:56 2019 +0100
tree 7ce9d14e2341d9087db505db3e91e001d6ab3a6c
parent 7a5058e3bfea4149acef2ad98d8fdd62605a0f4c

Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index ac3580e..9bdd8ee 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -4276,7 +4276,8 @@
 
     // 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))

imgui_demo.cpp

diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index d580640..c5cd34a 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -1983,7 +1983,7 @@
         {
             ImGui::BeginChild("scrolling"); // Demonstrate a trick: you can use Begin to set yourself in the context of another window (here we are already out of your child window)
             ImGui::SetScrollX(ImGui::GetScrollX() + scroll_x_delta);
-            ImGui::End();
+            ImGui::EndChild();
         }
         ImGui::TreePop();
     }