|
|
@ -10679,7 +10679,11 @@ static bool ImGui::GetWindowAlwaysWantOwnViewport(ImGuiWindow* window) |
|
|
|
static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport) |
|
|
|
static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport) |
|
|
|
{ |
|
|
|
{ |
|
|
|
ImGuiContext& g = *GImGui; |
|
|
|
ImGuiContext& g = *GImGui; |
|
|
|
if (!(viewport->Flags & (ImGuiViewportFlags_CanHostOtherWindows | ImGuiViewportFlags_Minimized)) || window->Viewport == viewport) |
|
|
|
if (window->Viewport == viewport) |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
if ((viewport->Flags & ImGuiViewportFlags_CanHostOtherWindows) == 0) |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
if ((viewport->Flags & ImGuiViewportFlags_Minimized) != 0) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
if (!viewport->GetMainRect().Contains(window->Rect())) |
|
|
|
if (!viewport->GetMainRect().Contains(window->Rect())) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|