commit 83e8d10fabc1b8a9cf069c64edeba53b65e6be63
author omar <omarcornut@gmail.com> Sun Aug 20 21:08:07 2017 +0800
committer omar <omarcornut@gmail.com> Sun Aug 20 21:08:07 2017 +0800
tree 52df1a98fc776bbe7eb84a1d401b51e2d671834f
parent 1ebd7ec0494a1b97ee5ce06ad0ffb4d0964d7bff

Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. (#125, #913, #893, #1138)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 33b9178..c677e79 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10052,7 +10052,8 @@
 
     const float content_region_width = (window->SizeContentsExplicit.x != 0.0f) ? window->SizeContentsExplicit.x : window->Size.x;
     window->DC.ColumnsMinX = window->DC.IndentX - g.Style.ItemSpacing.x; // Lock our horizontal range
-    window->DC.ColumnsMaxX = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
+    //window->DC.ColumnsMaxX = content_region_width - window->Scroll.x -((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
+    window->DC.ColumnsMaxX = content_region_width - window->Scroll.x - window->ScrollbarSizes.x;
     window->DC.ColumnsStartPosY = window->DC.CursorPos.y;
     window->DC.ColumnsStartMaxPosX = window->DC.CursorMaxPos.x;
     window->DC.ColumnsCellMinY = window->DC.ColumnsCellMaxY = window->DC.CursorPos.y;