mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-14 17:07:01 +00:00
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6
. (#913, #125). End() calls EndColumns() directly.
This commit is contained in:
parent
a511b00226
commit
9307631c90
@ -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
|
||||
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user