瀏覽代碼

Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.

omar 6 年之前
父節點
當前提交
510f0e505c
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      imgui.cpp

+ 3 - 1
imgui.cpp

@@ -7435,6 +7435,8 @@ static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImG
             if (g.Windows[n]->Viewport == old_viewport)
                 SetWindowViewport(g.Windows[n], viewport);
     SetWindowViewport(window, viewport);
+    BringWindowToDisplayFront(window);
+
     return true;
 }
 
@@ -7748,7 +7750,7 @@ static void ImGui::UpdateSelectWindowViewport(ImGuiWindow* window)
     }
     else if (window->Viewport && window != window->Viewport->Window && window->Viewport->Window && !(flags & ImGuiWindowFlags_ChildWindow))
     {
-        // When called from Begin() we don't have access to a proper version of the Hidden flag yet.
+        // When called from Begin() we don't have access to a proper version of the Hidden flag yet, so we replicate this code.
         const bool will_be_visible = (window->DockIsActive && !window->DockTabIsVisible) ? false : true;
         if ((window->Flags & ImGuiWindowFlags_DockNodeHost) && window->Viewport->LastFrameActive < g.FrameCount && will_be_visible)
         {