Tables: Return false when window is Collapsed (consistent + helpful f…

…or doc) + Fix empty context menu.
ocornut · Dec 30, 2019 · 046cd4b · 046cd4b
1 parent 3b2ce6c
commit 046cd4b
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
@@ -7730,6 +7730,8 @@ bool    ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
 {
     ImGuiContext& g = *GImGui;
     ImGuiWindow* outer_window = GetCurrentWindow();
+    if (outer_window->SkipItems) // Consistent with other tables + beneficial side effect that assert on miscalling EndTable() will be more visible.
+        return false;
 
     // Sanity checks
     IM_ASSERT(columns_count > 0 && columns_count < IMGUI_TABLE_MAX_COLUMNS && "Only 0..63 columns allowed!");
@@ -9414,12 +9416,13 @@ void    ImGui::TableAutoHeaders()
 
     // Context Menu
     if (open_context_popup != INT_MAX)
-    {
-        table->IsContextPopupOpen = true;
-        table->ContextPopupColumn = (ImS8)open_context_popup;
-        table->InstanceInteracted = table->InstanceNo;
-        OpenPopup("##TableContextMenu");
-    }
+        if (table->Flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
+        {
+            table->IsContextPopupOpen = true;
+            table->ContextPopupColumn = (ImS8)open_context_popup;
+            table->InstanceInteracted = table->InstanceNo;
+            OpenPopup("##TableContextMenu");
+        }
 }
 
 // Emit a column header (text + optional sort order)