Skip to content

Commit

Permalink
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed a…
Browse files Browse the repository at this point in the history
…lready before, and fixed again in this branch by 3bf2af2. (#913, #125). End() calls EndColumns() directly.
  • Loading branch information
ocornut committed Aug 20, 2017
1 parent a511b00 commit 9307631
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4450,7 +4450,7 @@ void ImGui::End()
ImGuiWindow* window = g.CurrentWindow;

if (window->DC.ColumnsCount != 1) // close columns set if any is open
Columns(1, "#CLOSECOLUMNS");
EndColumns();
PopClipRect(); // inner window clip rectangle

// Stop logging
Expand Down Expand Up @@ -10078,8 +10078,6 @@ void ImGui::EndColumns()
ImGuiWindow* window = GetCurrentWindow();
IM_ASSERT(window->DC.ColumnsCount > 1);

if (window->DC.ColumnsCurrent != 0)
ItemSize(ImVec2(0, 0)); // Advance to column 0
PopItemWidth();
PopClipRect();
window->DrawList->ChannelsMerge();
Expand Down

0 comments on commit 9307631

Please sign in to comment.