NextColumn() tidying up with a sane early out

docking
ocornut 9 years ago
parent ba7acdac47
commit 297bb3fc92

@ -9178,12 +9178,10 @@ void ImGui::NewLine()
void ImGui::NextColumn() void ImGui::NextColumn()
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems) if (window->SkipItems || window->DC.ColumnsCount <= 1)
return; return;
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
if (window->DC.ColumnsCount > 1)
{
PopItemWidth(); PopItemWidth();
PopClipRect(); PopClipRect();
@ -9209,7 +9207,6 @@ void ImGui::NextColumn()
PushColumnClipRect(); PushColumnClipRect();
PushItemWidth(GetColumnWidth() * 0.65f); // FIXME: Move on columns setup PushItemWidth(GetColumnWidth() * 0.65f); // FIXME: Move on columns setup
} }
}
int ImGui::GetColumnIndex() int ImGui::GetColumnIndex()
{ {

Loading…
Cancel
Save