From be03882a15b0a785dffba08a95fb265db23ffc14 Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Tue, 26 Sep 2017 15:43:48 +0200
Subject: [PATCH] Separator(): output vertical separator when used in
 horizontal layout mode, so it works in menu bars.

---
 imgui.cpp        | 67 +++++++++++++++++++++++++++++++++---------------
 imgui_internal.h |  7 +++++
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 7668c88a..4aafd884 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -9893,37 +9893,62 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
 // Horizontal separating line.
 void ImGui::Separator()
 {
+    ImGuiContext& g = *GImGui;
     ImGuiWindow* window = GetCurrentWindow();
     if (window->SkipItems)
         return;
 
-    if (window->DC.ColumnsCount > 1)
-        PopClipRect();
+    ImGuiWindowFlags flags = 0;
+    if ((flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)) == 0)
+    {
+        if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
+            flags |= ImGuiSeparatorFlags_Vertical;
+        else
+            flags |= ImGuiSeparatorFlags_Horizontal;
+    }
+    IM_ASSERT(ImIsPowerOfTwo((int)(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical))));   // Check that only 1 option is selected
 
-    float x1 = window->Pos.x;
-    float x2 = window->Pos.x + window->Size.x;
-    if (!window->DC.GroupStack.empty())
-        x1 += window->DC.IndentX;
-
-    const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y+1.0f));
-    ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
-    if (!ItemAdd(bb, NULL))
+    if (flags & ImGuiSeparatorFlags_Horizontal)
     {
         if (window->DC.ColumnsCount > 1)
+            PopClipRect();
+
+        float x1 = window->Pos.x;
+        float x2 = window->Pos.x + window->Size.x;
+        if (!window->DC.GroupStack.empty())
+            x1 += window->DC.IndentX;
+
+        const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y+1.0f));
+        ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
+        if (!ItemAdd(bb, NULL))
+        {
+            if (window->DC.ColumnsCount > 1)
+                PushColumnClipRect();
+            return;
+        }
+
+        window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x,bb.Min.y), GetColorU32(ImGuiCol_Separator));
+
+        if (g.LogEnabled)
+            LogText(IM_NEWLINE "--------------------------------");
+
+        if (window->DC.ColumnsCount > 1)
+        {
             PushColumnClipRect();
-        return;
+            window->DC.ColumnsCellMinY = window->DC.CursorPos.y;
+        }
     }
-
-    window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x,bb.Min.y), GetColorU32(ImGuiCol_Separator));
-
-    ImGuiContext& g = *GImGui;
-    if (g.LogEnabled)
-        LogText(IM_NEWLINE "--------------------------------");
-
-    if (window->DC.ColumnsCount > 1)
+    else if (flags & ImGuiSeparatorFlags_Vertical)
     {
-        PushColumnClipRect();
-        window->DC.ColumnsCellMinY = window->DC.CursorPos.y;
+        const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(1.0f, window->DC.CurrentLineHeight));
+        ItemSize(ImVec2(bb.GetWidth(), 0.0f));
+        if (!ItemAdd(bb, NULL))
+            return;
+
+        window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
+
+        if (g.LogEnabled)
+            LogText("|");
     }
 }
 
diff --git a/imgui_internal.h b/imgui_internal.h
index cd78dbbd..0e779a2a 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -48,6 +48,7 @@ typedef int ImGuiLayoutType;      // enum ImGuiLayoutType_
 typedef int ImGuiButtonFlags;     // enum ImGuiButtonFlags_
 typedef int ImGuiTreeNodeFlags;   // enum ImGuiTreeNodeFlags_
 typedef int ImGuiSliderFlags;     // enum ImGuiSliderFlags_
+typedef int ImGuiSeparatorFlags;  // enum ImGuiSeparatorFlags_
 typedef int ImGuiItemFlags;       // enum ImGuiItemFlags_
 
 //-------------------------------------------------------------------------
@@ -203,6 +204,12 @@ enum ImGuiSelectableFlagsPrivate_
     ImGuiSelectableFlags_DrawFillAvailWidth = 1 << 6
 };
 
+enum ImGuiSeparatorFlags_
+{
+    ImGuiSeparatorFlags_Horizontal          = 1 << 0,   // Axis default to current layout type, so generally Horizontal unless e.g. in a menu bar
+    ImGuiSeparatorFlags_Vertical            = 1 << 1
+};
+
 // FIXME: this is in development, not exposed/functional as a generic feature yet.
 enum ImGuiLayoutType_
 {