mirror of
https://github.com/ocornut/imgui.git
synced 2024-12-14 13:39:01 +08:00
Nav, Docking: Fix dimming on docked windows.
This commit is contained in:
parent
c1b70e0391
commit
fc198fe1db
@ -4828,10 +4828,6 @@ void ImGui::Render()
|
|||||||
AddDrawListToDrawData(&viewport->DrawDataBuilder.Layers[0], GetBackgroundDrawList(viewport));
|
AddDrawListToDrawData(&viewport->DrawDataBuilder.Layers[0], GetBackgroundDrawList(viewport));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw modal/window whitening backgrounds
|
|
||||||
if (first_render_of_frame)
|
|
||||||
RenderDimmedBackgrounds();
|
|
||||||
|
|
||||||
// Add ImDrawList to render
|
// Add ImDrawList to render
|
||||||
ImGuiWindow* windows_to_render_top_most[2];
|
ImGuiWindow* windows_to_render_top_most[2];
|
||||||
windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindowDockTree : NULL;
|
windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindowDockTree : NULL;
|
||||||
@ -4847,6 +4843,10 @@ void ImGui::Render()
|
|||||||
if (windows_to_render_top_most[n] && IsWindowActiveAndVisible(windows_to_render_top_most[n])) // NavWindowingTarget is always temporarily displayed as the top-most window
|
if (windows_to_render_top_most[n] && IsWindowActiveAndVisible(windows_to_render_top_most[n])) // NavWindowingTarget is always temporarily displayed as the top-most window
|
||||||
AddRootWindowToDrawData(windows_to_render_top_most[n]);
|
AddRootWindowToDrawData(windows_to_render_top_most[n]);
|
||||||
|
|
||||||
|
// Draw modal/window whitening backgrounds
|
||||||
|
if (first_render_of_frame)
|
||||||
|
RenderDimmedBackgrounds();
|
||||||
|
|
||||||
ImVec2 mouse_cursor_offset, mouse_cursor_size, mouse_cursor_uv[4];
|
ImVec2 mouse_cursor_offset, mouse_cursor_size, mouse_cursor_uv[4];
|
||||||
if (g.IO.MouseDrawCursor && g.MouseCursor != ImGuiMouseCursor_None)
|
if (g.IO.MouseDrawCursor && g.MouseCursor != ImGuiMouseCursor_None)
|
||||||
g.IO.Fonts->GetMouseCursorTexData(g.MouseCursor, &mouse_cursor_offset, &mouse_cursor_size, &mouse_cursor_uv[0], &mouse_cursor_uv[2]);
|
g.IO.Fonts->GetMouseCursorTexData(g.MouseCursor, &mouse_cursor_offset, &mouse_cursor_size, &mouse_cursor_uv[0], &mouse_cursor_uv[2]);
|
||||||
|
Loading…
Reference in New Issue
Block a user