Mirrors/imgui
0
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-18 17:11:23 +01:00
Code Packages Releases Activity

Viewports: reworked IsViewportAbove() test as an alternate fix for #8948, #9172, #9131, #9128.

Browse Source 
Worded in this order we can better benefit from the ParentViewport stack from 6fd4cf8e49.
This commit is contained in:
ocornut
2026-01-16 16:28:19 +01:00
parent 9eebd37b59
commit c389a9528f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imgui.cpp
View File

@@ -16555,6 +16555,7 @@ static bool ImGui::GetWindowAlwaysWantOwnViewport(ImGuiWindow* window)
// Heuristic, see #8948: depends on how backends handle OS-level parenting.
// Due to how parent viewport stack is layed out, note that IsViewportAbove(a,b) isn't always the same as !IsViewportAbove(b,a).
static bool IsViewportAbove(ImGuiViewportP* potential_above, ImGuiViewportP* potential_below)
{
// If ImGuiBackendFlags_HasParentViewport if set, ->ParentViewport chain should be accurate.
@@ -16597,7 +16598,7 @@ static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImG
continue;
if (viewport_obstructing->GetMainRect().Overlaps(window->Rect()))
if (IsViewportAbove(viewport_obstructing, viewport_dst))
if (viewport_src == NULL || !IsViewportAbove(viewport_obstructing, viewport_src))
if (viewport_src == NULL || IsViewportAbove(viewport_src, viewport_obstructing))
return false; // viewport_obstructing is between viewport_src and viewport_dst -> Cannot merge.
}