Skip to content

Commit

Permalink
Docking: Amend b16f738 fixed dimming of docked window + removed thin …
Browse files Browse the repository at this point in the history
…highlight around windows (never worked on docked window, not viewports friendly, hard to move to EndFrame) (ocornut#2700, ocornut#2539, ocornut#2522)
  • Loading branch information
ocornut committed Dec 3, 2021
1 parent b16f738 commit c122c0e
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6730,16 +6730,11 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
if (dim_bg_for_modal || dim_bg_for_window_list)
{
const ImU32 dim_bg_col = GetColorU32(dim_bg_for_modal ? ImGuiCol_ModalWindowDimBg : ImGuiCol_NavWindowingDimBg, g.DimBgRatio);
if (window->DockIsActive || (flags & ImGuiWindowFlags_DockNodeHost))
window->DrawList->ChannelsSetCurrent(0);
window->DrawList->AddRectFilled(viewport_rect.Min, viewport_rect.Max, dim_bg_col);
}

// Draw navigation selection/windowing rectangle background
if (dim_bg_for_window_list && window == g.NavWindowingTargetAnim)
{
ImRect bb = window->Rect();
bb.Expand(g.FontSize);
if (!bb.Contains(viewport_rect)) // Avoid drawing if the window covers all the viewport anyway
window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha * 0.25f), g.Style.WindowRounding);
if (window->DockIsActive || (flags & ImGuiWindowFlags_DockNodeHost))
window->DrawList->ChannelsSetCurrent(1);
}

// Child windows can render their decoration (bg color, border, scrollbars, etc.) within their parent to save a draw call (since 1.71)
Expand Down

0 comments on commit c122c0e

Please sign in to comment.