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)
This commit is contained in:
ocornut
2021-10-27 12:02:42 +02:00
parent 0f2898ea88
commit c363b6df2b
2 changed files with 10 additions and 3 deletions

View File

@ -6719,9 +6719,14 @@ void ImGui::PopTextWrapPos()
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;
}