ilusha/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-09-29 04:35:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MultiSelect: Box-Select + Tables: fixed when using SpanAllColumns paths. (#9383, #7994)

Browse source 
Amend ac88294 + d7b40ab
This commit is contained in:
ocornut 2026-04-28 14:58:29 +02:00
parent ab36fbaf48
commit d1a8995634
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
imgui_widgets.cpp
View file

@ -8367,11 +8367,20 @@ void ImGui::MultiSelectItemFooter(ImGuiID id, bool* p_selected, bool* p_pressed)
if (ImGuiTable* table = g.CurrentTable) if (ImGuiTable* table = g.CurrentTable)
if (table->CurrentColumn != -1) if (table->CurrentColumn != -1)
{ {
// FIXME: We cannot use current ClipRect as it includes HostClipRect. // FIXME: We cannot solely use current ClipRect as it includes HostClipRect.
// A more generic version would be nice, but window->WorkRect.Min/Max exclude CellPadding. (#7994) // However we account for ClipRect being larger than current column (e.g. when using SpanAllColumns)
// A more generic version would be nice, but window->WorkRect.Min/Max exclude CellPadding. (#7994, #9383)
ImGuiTableColumn* column = &table->Columns[table->CurrentColumn]; ImGuiTableColumn* column = &table->Columns[table->CurrentColumn];
item_rect.Min.x = ImMax(item_rect.Min.x, column->MinX); item_rect.Min.x = ImMax(item_rect.Min.x, column->MinX);
item_rect.Max.x = ImMin(item_rect.Max.x, column->MaxX); item_rect.Max.x = ImMin(item_rect.Max.x, column->MaxX);
float clip_min_x = (g.LastItemData.ItemFlags & ImGuiItemStatusFlags_HasClipRect) ? g.LastItemData.ClipRect.Min.x : window->ClipRect.Min.x;
float clip_max_x = (g.LastItemData.ItemFlags & ImGuiItemStatusFlags_HasClipRect) ? g.LastItemData.ClipRect.Max.x : window->ClipRect.Max.x;
if (clip_min_x != clip_max_x) // When zero sized we expect that bounds have been clamped and thus are unreliable
{
item_rect.Min.x = ImMax(item_rect.Min.x, clip_min_x);
item_rect.Max.x = ImMin(item_rect.Max.x, clip_max_x);
}
} }
const bool rect_overlap_curr = bs->BoxSelectRectCurr.Overlaps(item_rect); const bool rect_overlap_curr = bs->BoxSelectRectCurr.Overlaps(item_rect);
const bool rect_overlap_prev = bs->BoxSelectRectPrev.Overlaps(item_rect); const bool rect_overlap_prev = bs->BoxSelectRectPrev.Overlaps(item_rect);