mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Viewports: fixed crsah in UpdateTryMergeWindowIntoHostViewport(). (#8948)

Browse source 
Amend e7aa0de. Reproed in "testengine_cov_perftool".
This commit is contained in:
ocornut 2025-10-08 16:53:34 +02:00
parent 8f3f428228
commit cab82d9c76
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
imgui.cpp
View file

@ -16424,8 +16424,9 @@ static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImG
if (viewport_2 == viewport || viewport_2 == window->Viewport)
continue;
if (viewport_2->GetMainRect().Overlaps(window->Rect()))
if (IsViewportAbove(viewport_2, viewport) && !IsViewportAbove(viewport_2, window->Viewport))
return false;
if (IsViewportAbove(viewport_2, viewport))
if (window->Viewport == NULL || !IsViewportAbove(viewport_2, window->Viewport))
return false;
}
// Move to the existing viewport, Move child/hosted windows as well (FIXME-OPT: iterate child)