From a9009b133c2e9bca595492f0aad3be7503f52723 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 28 Nov 2015 15:52:57 +0000 Subject: [PATCH] Columns: Undo accidental change from 807d4ff92cb568f77e3a144a0e9c9740de5b679e --- imgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index a473433e..126509b4 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -8785,7 +8785,7 @@ float ImGui::GetColumnOffset(int column_index) const float content_region_width = window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x; const float min_x = window->DC.IndentX; - const float max_x = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0.0f : window->ScrollbarSizes.x);// - window->WindowPadding().x; + const float max_x = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0.0f : g.Style.ScrollbarSize);// - window->WindowPadding().x; const float x = min_x + t * (max_x - min_x); return (float)(int)x; }