From 7ff1c149b5657ee83c9146b6a467040ca0bbe921 Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Sun, 20 Aug 2017 20:40:25 +0800
Subject: [PATCH] Columns: Fixed another form of shearing made visible by the
 PreserveWidth option. The code was initially added in
 c46d5634d43c9f0296d845478c07b04f2c40d339 to fix because we've fixed in
 e42aaede42eb6d8a47cf104f3afd6057b13a61ee. (#913, #125)

---
 imgui.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imgui.cpp b/imgui.cpp
index f20646e8229f..a7ff91224f80 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -9958,17 +9958,19 @@ static float GetDraggedColumnOffset(int column_index)
 
 float ImGui::GetColumnOffset(int column_index)
 {
-    ImGuiContext& g = *GImGui;
     ImGuiWindow* window = GetCurrentWindowRead();
     if (column_index < 0)
         column_index = window->DC.ColumnsCurrent;
 
+    /*
     if (g.ActiveId)
     {
+        ImGuiContext& g = *GImGui;
         const ImGuiID column_id = window->DC.ColumnsSetId + ImGuiID(column_index);
         if (g.ActiveId == column_id)
             return GetDraggedColumnOffset(column_index);
     }
+    */
 
     IM_ASSERT(column_index < window->DC.ColumnsData.Size);
     const float t = window->DC.ColumnsData[column_index].OffsetNorm;
@@ -10148,6 +10150,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border)
 		EndColumns();
     
     ImGuiColumnsFlags flags = (border ? 0 : ImGuiColumnsFlags_NoBorder);
+    //flags |= ImGuiColumnsFlags_NoPreserveWidths | ImGuiColumnsFlags_NoForceWithinWindow;    // NB: Legacy behavior
     if (columns_count != 1)
         BeginColumns(id, columns_count, flags);
 }