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

ocornut · Mar 11, 2020 · a5041c8 · a5041c8
1 parent 9a46a19
commit a5041c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/imgui.cpp b/imgui.cpp
@@ -5950,7 +5950,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);