Quellcode durchsuchen

Docking, Style: resizing separators use same colors as window borders. (#2522)

ocornut vor 2 Jahren
Ursprung
Commit
51b348095c
2 geänderte Dateien mit 8 neuen und 0 gelöschten Zeilen
  1. 4 0
      docs/CHANGELOG.txt
  2. 4 0
      imgui.cpp

+ 4 - 0
docs/CHANGELOG.txt

@@ -129,6 +129,10 @@ Other changes:
 
 
 Docking+Viewports Branch:
 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
 - Docking: added style.DockingSeparatorSize, ImGuiStyleVar_DockingSeparatorSize. Now
   also scaled by style.ScaleAllSizes(). (#3481, #4721, #2522) [@PossiblyAShrub, @wobbier]
   also scaled by style.ScaleAllSizes(). (#3481, #4721, #2522) [@PossiblyAShrub, @wobbier]
 - Docking: fixed rendering of docked-window scrollbar above outer border. (#2522)
 - Docking: fixed rendering of docked-window scrollbar above outer border. (#2522)

+ 4 - 0
imgui.cpp

@@ -16519,7 +16519,11 @@ static void ImGui::DockNodeUpdate(ImGuiDockNode* node)
     if (node->IsRootNode() && host_window)
     if (node->IsRootNode() && host_window)
     {
     {
         DockNodeTreeUpdatePosSize(node, host_window->Pos, host_window->Size);
         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);
         DockNodeTreeUpdateSplitter(node);
+        PopStyleColor(3);
     }
     }
 
 
     // Draw empty node background (currently can only be the Central Node)
     // Draw empty node background (currently can only be the Central Node)