Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-02-22 05:09:56 +01:00
Code Releases Wiki Activity

Docking: Fixed bad bug, dock node host wouldn't merge background. (#6753, #6716)

Browse Source 
Fixes f422e78. Didn't crash because g.Windows[] is always larger than g.WindowsFocusOrder[].
This commit is contained in:
ocornut 2023-08-28 11:24:29 +02:00
parent 475453668d
commit 762ec445e6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -5341,20 +5341,16 @@ void ImGui::Render()
CallContextHooks(&g, ImGuiContextHookType_RenderPre); CallContextHooks(&g, ImGuiContextHookType_RenderPre);
// Add background ImDrawList (for each active viewport) // Add background ImDrawList (for each active viewport)
for (int n = 0; n != g.Viewports.Size; n++) for (ImGuiViewportP* viewport : g.Viewports)
{ {
ImGuiViewportP* viewport = g.Viewports[n];
InitViewportDrawData(viewport); InitViewportDrawData(viewport);
if (viewport->BgFgDrawLists[0] != NULL) if (viewport->BgFgDrawLists[0] != NULL)
AddDrawListToDrawDataEx(&viewport->DrawDataP, viewport->DrawDataBuilder.Layers[0], GetBackgroundDrawList(viewport)); AddDrawListToDrawDataEx(&viewport->DrawDataP, viewport->DrawDataBuilder.Layers[0], GetBackgroundDrawList(viewport));
} }
for (int n = 0; n != g.WindowsFocusOrder.Size; n++) for (ImGuiWindow* window : g.WindowsFocusOrder)
{
ImGuiWindow* window = g.Windows[n];
if (window->Flags & ImGuiWindowFlags_DockNodeHost) if (window->Flags & ImGuiWindowFlags_DockNodeHost)
window->DrawList->ChannelsMerge(); window->DrawList->ChannelsMerge();
}
// Draw modal/window whitening backgrounds // Draw modal/window whitening backgrounds
RenderDimmedBackgrounds(); RenderDimmedBackgrounds();