commit c363b6df2b4d4aeb7978b71b03ae5002bd5ae6ca
author ocornut <omarcornut@gmail.com> Wed Oct 27 12:02:42 2021 +0200
committer ocornut <omarcornut@gmail.com> Wed Oct 27 12:03:14 2021 +0200
tree 6e057a63720db3d02a9f888b432bf90c6beafe84
parent 0f2898ea884eb54d257c7826ef2231ce0211ef54

Modals: fixed issue hovering popups inside a child inside a modal. Fixed IsWindowFocused()/IsWindowHovered() issues with childs inside popups. (#4676)(#4676, #4527)

Amend/fix 6b1e094f, fc4988ffb (Sep 24)

docs/CHANGELOG.txt

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 90033f7..0ae0d0b 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -39,6 +39,8 @@
 Other Changes:
 
 - Added IsMouseTripleClicked() function. Tracking multi-click count in IO structure. (#3229) [@kudaba]
+- Modals: fixed issue hovering popups inside a child inside a modal. (#4676, #4527)
+- Fixed IsWindowFocused()/IsWindowHovered() issues with childs inside popups. (#4676)
 - InputText: made double-click select word, triple-line select line. Word delimitation logic differs
   slightly from the one used by CTRL+arrows. (#2244)
 - Backends: Vulkan: Call vkCmdSetScissor() at the end of render with a full-viewport to reduce

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 880c933..912d6c9 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -6719,9 +6719,14 @@
 
 static ImGuiWindow* GetCombinedRootWindow(ImGuiWindow* window, bool popup_hierarchy)
 {
-    window = window->RootWindow;
-    if (popup_hierarchy)
-        window = window->RootWindowPopupTree;
+    ImGuiWindow* last_window = NULL;
+    while (last_window != window)
+    {
+        last_window = window;
+        window = window->RootWindow;
+        if (popup_hierarchy)
+            window = window->RootWindowPopupTree;
+    }
     return window;
 }