From 9307631c901aae10601dd669a98c9793064004fe Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Sun, 20 Aug 2017 19:25:29 +0800
Subject: [PATCH] Columns: Removed unnecessary/misleading dummy ItemSize(). Was
 fixed already before, and fixed again in this branch by
 3bf2af23e641909890a568850e5dac8ebf8930f8. (#913, #125). End() calls
 EndColumns() directly.

---
 imgui.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 08d63a8f..fb43a4e6 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -4450,7 +4450,7 @@ void ImGui::End()
     ImGuiWindow* window = g.CurrentWindow;
 
     if (window->DC.ColumnsCount != 1) // close columns set if any is open
-        Columns(1, "#CLOSECOLUMNS");
+        EndColumns();
     PopClipRect();   // inner window clip rectangle
 
     // Stop logging
@@ -10078,8 +10078,6 @@ void ImGui::EndColumns()
 	ImGuiWindow* window = GetCurrentWindow();
 	IM_ASSERT(window->DC.ColumnsCount > 1);
 
-	if (window->DC.ColumnsCurrent != 0)
-		ItemSize(ImVec2(0, 0));   // Advance to column 0
 	PopItemWidth();
 	PopClipRect();
 	window->DrawList->ChannelsMerge();