Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-02-16 22:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tables: Return false when window is Collapsed (consistent + helpful for doc) + Fix empty context menu.

Browse Source
This commit is contained in:
omar 2019-12-29 17:12:09 +01:00 committed by ocornut
parent 81453ac42c
commit 046fad01f1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
imgui_tables.cpp
View File

@ -155,6 +155,8 @@ bool ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiWindow* outer_window = GetCurrentWindow(); 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 // Sanity checks
IM_ASSERT(columns_count > 0 && columns_count < IMGUI_TABLE_MAX_COLUMNS && "Only 0..63 columns allowed!"); IM_ASSERT(columns_count > 0 && columns_count < IMGUI_TABLE_MAX_COLUMNS && "Only 0..63 columns allowed!");
@ -1839,12 +1841,13 @@ void ImGui::TableAutoHeaders()
// Context Menu // Context Menu
if (open_context_popup != INT_MAX) if (open_context_popup != INT_MAX)
{ if (table->Flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable))
table->IsContextPopupOpen = true; {
table->ContextPopupColumn = (ImS8)open_context_popup; table->IsContextPopupOpen = true;
table->InstanceInteracted = table->InstanceNo; table->ContextPopupColumn = (ImS8)open_context_popup;
OpenPopup("##TableContextMenu"); table->InstanceInteracted = table->InstanceNo;
} OpenPopup("##TableContextMenu");
}
} }
// Emit a column header (text + optional sort order) // Emit a column header (text + optional sort order)