Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-09-24 11:38:34 +02:00
Code Releases Wiki Activity

Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (#913, #125). End() calls EndColumns() directly.

Browse Source
This commit is contained in:
omar 2017-08-20 19:25:29 +08:00
parent a511b00226
commit 9307631c90
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -4450,7 +4450,7 @@ void ImGui::End()
ImGuiWindow* window = g.CurrentWindow; ImGuiWindow* window = g.CurrentWindow;
if (window->DC.ColumnsCount != 1) // close columns set if any is open if (window->DC.ColumnsCount != 1) // close columns set if any is open
Columns(1, "#CLOSECOLUMNS"); EndColumns();
PopClipRect(); // inner window clip rectangle PopClipRect(); // inner window clip rectangle
// Stop logging // Stop logging
@ -10078,8 +10078,6 @@ void ImGui::EndColumns()
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
IM_ASSERT(window->DC.ColumnsCount > 1); IM_ASSERT(window->DC.ColumnsCount > 1);
if (window->DC.ColumnsCurrent != 0)
ItemSize(ImVec2(0, 0)); // Advance to column 0
PopItemWidth(); PopItemWidth();
PopClipRect(); PopClipRect();
window->DrawList->ChannelsMerge(); window->DrawList->ChannelsMerge();