commit 7ee623d9b1385fffecc989b5a9fb371698bad060
author omar <omarcornut@gmail.com> Sun Apr 12 18:58:06 2020 +0200
committer omar <omarcornut@gmail.com> Sun Apr 12 18:58:06 2020 +0200
tree 309443719a569cd265fc4d30efcfe3160a78e143
parent ec7294d890d7477047eccfdd5463df6cd72cb6dd

Internals: FocusScope not inherited by popups, modals. Amend a5041c88 2ebe08be)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 2aaddb6..5614f1e 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -5902,7 +5902,7 @@
         window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
         window->DC.NavLayerActiveMask = window->DC.NavLayerActiveMaskNext;
         window->DC.NavLayerActiveMaskNext = 0x00;
-        window->DC.NavFocusScopeIdCurrent = parent_window ? parent_window->DC.NavFocusScopeIdCurrent : 0;
+        window->DC.NavFocusScopeIdCurrent = (flags & ImGuiWindowFlags_ChildWindow) ? parent_window->DC.NavFocusScopeIdCurrent : 0;
         window->DC.NavHideHighlightOneFrame = false;
         window->DC.NavHasScroll = (window->ScrollMax.y > 0.0f);