Focus: Child inherit focus scope from parent (amend 2ebe08b).

sergeyn · Mar 30, 2020 · 7423b55 · 7423b55
1 parent 9b2de59
commit 7423b55
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/imgui.cpp b/imgui.cpp
@@ -6102,7 +6102,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
         window->DC.NavLayerActiveMask = window->DC.NavLayerActiveMaskNext;
         window->DC.NavLayerActiveMaskNext = 0x00;
-        window->DC.NavFocusScopeIdCurrent = 0;
+        window->DC.NavFocusScopeIdCurrent = parent_window ? parent_window->DC.NavFocusScopeIdCurrent : 0;
         window->DC.NavHideHighlightOneFrame = false;
         window->DC.NavHasScroll = (window->ScrollMax.y > 0.0f);