Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 15:50:25 +01:00
Code Releases Wiki Activity

Columns: avoid growing ColumnsData vector when closing a window with no columns (#125)

Browse Source 
(Will break calling GetColumnOffset() when there's no column but it
would only have worked after the first frame anyway, so basically it
didn't work)
This commit is contained in:
ocornut 2015-11-26 23:07:10 +00:00
parent 1aac69c937
commit 58b23b4785
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui.cpp
View File

@ -8801,7 +8801,7 @@ void ImGui::SetColumnOffset(int column_index, float offset)
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 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
const float max_x = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
const float t = (offset - min_x) / (max_x - min_x);
window->DC.StateStorage->SetFloat(column_id, t);
window->DC.ColumnsData[column_index].OffsetNorm = t;
@ -8910,9 +8910,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border)
}
else
{
window->DC.ColumnsData.resize(2);
window->DC.ColumnsData[0].OffsetNorm = 0.0f;
window->DC.ColumnsData[1].OffsetNorm = 1.0f;
window->DC.ColumnsData.resize(0);
}
}