NextColumn() tidying up with a sane early out

ago%!(EXTRA string=9 years) · 297bb3fc92
parent ba7acdac47
commit 297bb3fc92
1 changed files with 23 additions and 26 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -9178,12 +9178,10 @@ void ImGui::NewLine()
 void ImGui::NextColumn()
 {
    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems)
+    if (window->SkipItems || window->DC.ColumnsCount <= 1)
        return;

    ImGuiContext& g = *GImGui;
-    if (window->DC.ColumnsCount > 1)
-    {
    PopItemWidth();
    PopClipRect();

@ -9208,7 +9206,6 @@ void ImGui::NextColumn()

    PushColumnClipRect();
    PushItemWidth(GetColumnWidth() * 0.65f);  // FIXME: Move on columns setup
-    }
 }

 int ImGui::GetColumnIndex()