anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Tables: Tidying up TableDrawMergeChannels() with a struct. (3058)

Browse Source
features/potocpav-newer-lines-2
ocornut ago%!(EXTRA string=6 years)
parent 7277ab6530
commit d37cef40f2
1 changed files with 19 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      imgui_tables.cpp

33
imgui_tables.cpp
Unescape View File

@ -1248,13 +1248,16 @@ void ImGui::TableDrawMergeChannels(ImGuiTable* table)
const bool is_frozen_v = (table->FreezeRowsCount > 0); const bool is_frozen_v = (table->FreezeRowsCount > 0);
const bool is_frozen_h = (table->FreezeColumnsCount > 0); const bool is_frozen_h = (table->FreezeColumnsCount > 0);
// Track which groups (1-4) we are going to attempt to merge, and which channels goes into each group. // Track which groups we are going to attempt to merge, and which channels goes into each group.
struct MergeGroup
{
ImRect ClipRect;
ImU64 ChannelsMask;
int ChannelsCount;
};
int merge_group_mask = 0x00; int merge_group_mask = 0x00;
int merge_group_channels_count[4] = { 0 }; MergeGroup merge_groups[4];
ImU64 merge_group_channels_mask[4] = { 0 }; memset(merge_groups, 0, sizeof(merge_groups));
ImRect merge_group_clip_rect[4];
for (int n = 0; n < IM_ARRAYSIZE(merge_group_clip_rect); n++)
merge_group_clip_rect[n] = ImVec4(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
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
@ -1288,12 +1291,15 @@ void ImGui::TableDrawMergeChannels(ImGuiTable* table)
if (width_contents > column->WidthGiven && !(column->Flags & ImGuiTableColumnFlags_NoClipX)) if (width_contents > column->WidthGiven && !(column->Flags & ImGuiTableColumnFlags_NoClipX))
continue; continue;
const int dst_merge_group_idx = (is_frozen_h && column_n < table->FreezeColumnsCount ? 0 : 2) + (is_frozen_v ? merge_group_sub_n : 1); const int merge_group_dst_n = (is_frozen_h && column_n < table->FreezeColumnsCount ? 0 : 2) + (is_frozen_v ? merge_group_sub_n : 1);
IM_ASSERT(channel_no < 64); IM_ASSERT(channel_no < 64);
merge_group_mask |= (1 << dst_merge_group_idx); MergeGroup* merge_group = &merge_groups[merge_group_dst_n];
merge_group_channels_mask[dst_merge_group_idx] |= (ImU64)1 << channel_no; if (merge_group->ChannelsCount == 0)
merge_group_channels_count[dst_merge_group_idx]++; merge_group->ClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
merge_group_clip_rect[dst_merge_group_idx].Add(src_channel->_CmdBuffer[0].ClipRect); merge_group->ChannelsMask |= (ImU64)1 << channel_no;
merge_group->ChannelsCount++;
merge_group->ClipRect.Add(src_channel->_CmdBuffer[0].ClipRect);
merge_group_mask |= (1 << merge_group_dst_n);
// If we end with a single group and hosted by the outer window, we'll attempt to merge our draw command with // If we end with a single group and hosted by the outer window, we'll attempt to merge our draw command with
// the existing outer window command. But we can only do so if our columns all fit within the expected clip rect, // the existing outer window command. But we can only do so if our columns all fit within the expected clip rect,
@ -1313,7 +1319,6 @@ void ImGui::TableDrawMergeChannels(ImGuiTable* table)
column->DrawChannelCurrent = -1; column->DrawChannelCurrent = -1;
} }
// 2. Rewrite channel list in our preferred order // 2. Rewrite channel list in our preferred order
if (merge_group_mask != 0) if (merge_group_mask != 0)
{ {
@ -1324,9 +1329,9 @@ void ImGui::TableDrawMergeChannels(ImGuiTable* table)
remaining_mask &= (ImU64)~1; // Background channel 0 not part of the merge (see channel allocation in TableUpdateDrawChannels) remaining_mask &= (ImU64)~1; // Background channel 0 not part of the merge (see channel allocation in TableUpdateDrawChannels)
const bool may_extend_clip_rect_to_host_rect = ImIsPowerOfTwo(merge_group_mask); const bool may_extend_clip_rect_to_host_rect = ImIsPowerOfTwo(merge_group_mask);
for (int merge_group_n = 0; merge_group_n < 4; merge_group_n++) for (int merge_group_n = 0; merge_group_n < 4; merge_group_n++)
if (ImU64 merge_channels_mask = merge_group_channels_mask[merge_group_n]) if (ImU64 merge_channels_mask = merge_groups[merge_group_n].ChannelsMask)
{ {
ImRect merge_clip_rect = merge_group_clip_rect[merge_group_n]; ImRect merge_clip_rect = merge_groups[merge_group_n].ClipRect;
if (may_extend_clip_rect_to_host_rect) if (may_extend_clip_rect_to_host_rect)
{ {
//GetOverlayDrawList()->AddRect(table->HostClipRect.Min, table->HostClipRect.Max, IM_COL32(255, 0, 0, 200), 0.0f, ~0, 3.0f); //GetOverlayDrawList()->AddRect(table->HostClipRect.Min, table->HostClipRect.Max, IM_COL32(255, 0, 0, 200), 0.0f, ~0, 3.0f);

Write Preview
Loading…
Cancel
Save