commit 54bdd00df752008d01c50e9847564ef2357c5d56
author omar <omarcornut@gmail.com> Sun Aug 20 21:32:18 2017 +0800
committer omar <omarcornut@gmail.com> Sun Aug 20 21:32:18 2017 +0800
tree 3e56a0173248ab4219011301dc4245d1d0ccad4e
parent ea493fd8da9dafe64ad623c2d276318da2a8a19e

Columns: Fix for explicit content width and scrollbar. (#519, #125)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index c677e79..2f05901 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10050,10 +10050,10 @@
     window->DC.ColumnsCount = columns_count;
     window->DC.ColumnsFlags = flags;
 
-    const float content_region_width = (window->SizeContentsExplicit.x != 0.0f) ? window->SizeContentsExplicit.x : window->Size.x;
+    const float content_region_width = (window->SizeContentsExplicit.x != 0.0f) ? (window->SizeContentsExplicit.x) : (window->Size.x -window->ScrollbarSizes.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->ScrollbarSizes.x;
+    window->DC.ColumnsMaxX = content_region_width - window->Scroll.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;

imgui_demo.cpp

diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 73a6580..8911bcf 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -1623,13 +1623,13 @@
 
         if (ImGui::TreeNode("Horizontal Scrolling"))
         {
-            ImGui::SetNextWindowContentWidth(2000);
+            ImGui::SetNextWindowContentWidth(1500);
             ImGui::BeginChild("##scrollingregion", ImVec2(0, 120), false, ImGuiWindowFlags_HorizontalScrollbar);
             ImGui::Columns(10);
             for (int i = 0; i < 20; i++)
                 for (int j = 0; j < 10; j++)
                 {
-                    ImGui::Text("Line %d Column %d", i, j);
+                    ImGui::Text("Line %d Column %d...", i, j);
                     ImGui::NextColumn();
                 }
             ImGui::Columns(1);