From 51b348095c07b19dd42c3a286745e826edc12261 Mon Sep 17 00:00:00 2001 From: ocornut Date: Tue, 11 Jul 2023 15:17:54 +0200 Subject: [PATCH] Docking, Style: resizing separators use same colors as window borders. (#2522) --- docs/CHANGELOG.txt | 4 ++++ imgui.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 68180a68a..2ee49f524 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -129,6 +129,10 @@ Other changes: Docking+Viewports Branch: +- Docking, Style: resizing separators use same colors as window borders (ImGuiCol_Border) + for consistency. With default styles it doesn't make a big difference. (#2522) [@rmitton] + In the future if we promote using thick value for inner/outer docking padding we may + need to introduce new colors for it. - Docking: added style.DockingSeparatorSize, ImGuiStyleVar_DockingSeparatorSize. Now also scaled by style.ScaleAllSizes(). (#3481, #4721, #2522) [@PossiblyAShrub, @wobbier] - Docking: fixed rendering of docked-window scrollbar above outer border. (#2522) diff --git a/imgui.cpp b/imgui.cpp index 6554e1aac..e62751ed1 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -16519,7 +16519,11 @@ static void ImGui::DockNodeUpdate(ImGuiDockNode* node) if (node->IsRootNode() && host_window) { DockNodeTreeUpdatePosSize(node, host_window->Pos, host_window->Size); + PushStyleColor(ImGuiCol_Separator, g.Style.Colors[ImGuiCol_Border]); + PushStyleColor(ImGuiCol_SeparatorActive, g.Style.Colors[ImGuiCol_ResizeGripActive]); + PushStyleColor(ImGuiCol_SeparatorHovered, g.Style.Colors[ImGuiCol_ResizeGripHovered]); DockNodeTreeUpdateSplitter(node); + PopStyleColor(3); } // Draw empty node background (currently can only be the Central Node)