Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tables: Fix assert/crash when a visible column is clipped in a multi clip group situation.

Browse Source
This commit is contained in:
omar 2020-05-29 19:31:47 +02:00 committed by ocornut
parent e41fc7b5b0
commit 7513842284
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imgui_tables.cpp
View File

@ -1331,11 +1331,10 @@ void ImGui::TableDrawMergeChannels(ImGuiTable* table)
bool merge_groups_all_fit_within_inner_rect = (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0; bool merge_groups_all_fit_within_inner_rect = (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0;
// 1. Scan channels and take note of those which can be merged // 1. Scan channels and take note of those which can be merged
for (int order_n = 0; order_n < table->ColumnsCount; order_n++) for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
{ {
if (!(table->VisibleMaskByDisplayOrder & ((ImU64)1 << order_n))) if (!(table->VisibleUnclippedMaskByIndex & ((ImU64)1 << column_n)))
continue; continue;
const int column_n = table->DisplayOrderToIndex[order_n];
ImGuiTableColumn* column = &table->Columns[column_n]; ImGuiTableColumn* column = &table->Columns[column_n];
const int merge_group_sub_count = is_frozen_v ? 2 : 1; const int merge_group_sub_count = is_frozen_v ? 2 : 1;