EngineDev/imgui-mirror
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-11-06 06:25:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tables: fixed various issues with using ImGuiTableFlags_NoHostExtendX.

Browse Source
This commit is contained in:
ocornut 2026-10-29 20:42:01 +01:00
parent c1581882a4
commit 89845f9db6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/CHANGELOG.txt
View File

@ -80,14 +80,14 @@ Other Changes:
`io.DisplayFramebufferScale` is not an integer (regression in 1.93.0). (#9598) `io.DisplayFramebufferScale` is not an integer (regression in 1.93.0). (#9598)
- Tables: - Tables:
- Fixed various border overshooting issues, some mostly visible with transparent - Fixed various border overshooting issues, some mostly visible with transparent
borders: (#4678) borders and under specific conditions: (#4678)
- On non-scrolling tables, inner horizontal borders slightly overlapped - On non-scrolling tables, inner horizontal borders slightly overlapped
outer vertical ones with certain settings. outer vertical ones with certain settings.
- On non-scrolling tables, clamping lower border coordinates to stay within - On non-scrolling tables, clamping lower border coordinates to stay within
visible range (no visible change, but it makes ImDrawCmd AABB more sensible). visible range (no visible change, but it makes ImDrawCmd AABB more sensible).
- Fixed vertical inner borders slightly overlapping bottom outer border. - Fixed vertical inner borders slightly overlapping bottom outer border.
- Fixed various issues with using `ImGuiTableFlags_NoHostExtendY`: - Fixed various issues using `ImGuiTableFlags_NoHostExtendX`/`_NoHostExtendY`:
- Fixed selectable highlight straying off the Y2 clipping limit. - Fixed selectable highlight straying off the X2/Y2 clipping limit.
- Fixed parent window work rectangle affecting the Y2 clipping limit. - Fixed parent window work rectangle affecting the Y2 clipping limit.
- Fixed the Y2 clipping limit overlapping bottom outer border. - Fixed the Y2 clipping limit overlapping bottom outer border.
- ImVec2: added a check for cases where a custom `IM_VEC2_CLASS_EXTRA` macro - ImVec2: added a check for cases where a custom `IM_VEC2_CLASS_EXTRA` macro

11
imgui_tables.cpp
View File

@ -1310,8 +1310,9 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
table->Flags &= ~ImGuiTableFlags_NoHostExtendX; table->Flags &= ~ImGuiTableFlags_NoHostExtendX;
if (table->Flags & ImGuiTableFlags_NoHostExtendX) if (table->Flags & ImGuiTableFlags_NoHostExtendX)
{ {
table->OuterRect.Max.x = table->WorkRect.Max.x = unused_x1; const float border_size_outer_w = (table->Flags & ImGuiTableFlags_BordersOuterV) ? table->BorderSize : 0.0f;
table->InnerClipRect.Max.x = ImMin(table->InnerClipRect.Max.x, unused_x1); table->OuterRect.Max.x = table->WorkRect.Max.x = ImMin(table->OuterRect.Max.x, unused_x1 + border_size_outer_w);
table->InnerClipRect.Max.x = ImClamp(table->OuterRect.Max.x - border_size_outer_w, table->InnerClipRect.Min.x, table->InnerClipRect.Max.x);
} }
table->InnerWindow->ParentWorkRect = table->WorkRect; table->InnerWindow->ParentWorkRect = table->WorkRect;
table->BorderX1 = table->InnerClipRect.Min.x; table->BorderX1 = table->InnerClipRect.Min.x;
@ -2734,8 +2735,10 @@ void ImGui::TableSetupDrawChannels(ImGuiTable* table)
table->Bg0ClipRectForDrawCmd = table->OuterWindow->ClipRect; table->Bg0ClipRectForDrawCmd = table->OuterWindow->ClipRect;
table->Bg2ClipRectForDrawCmd = table->HostClipRect; table->Bg2ClipRectForDrawCmd = table->HostClipRect;
IM_ASSERT(table->BgClipRect.Min.y <= table->BgClipRect.Max.y); IM_ASSERT(table->BgClipRect.Min.y <= table->BgClipRect.Max.y);
if (table->Flags & ImGuiTableFlags_NoHostExtendX)
table->Bg2ClipRectForDrawCmd.Max.x = ImMin(table->Bg2ClipRectForDrawCmd.Max.x, table->BgClipRect.Max.x); // Don't apply to Bg0: shapes in Bg0 are already CPU clipped and it makes merging fails.
if (table->Flags & ImGuiTableFlags_NoHostExtendY) if (table->Flags & ImGuiTableFlags_NoHostExtendY)
table->Bg2ClipRectForDrawCmd.Max.y = ImMin(table->Bg2ClipRectForDrawCmd.Max.y, table->BgClipRect.Max.y); // Don't apply to Bg0: shapes in Bg0 are already CPU clipped and it makes merging fails. table->Bg2ClipRectForDrawCmd.Max.y = ImMin(table->Bg2ClipRectForDrawCmd.Max.y, table->BgClipRect.Max.y); // "
} }
// This function reorder draw channels based on matching clip rectangle, to facilitate merging them. Called by EndTable(). // This function reorder draw channels based on matching clip rectangle, to facilitate merging them. Called by EndTable().
@ -2893,7 +2896,7 @@ void ImGui::TableMergeDrawChannels(ImGuiTable* table)
merge_clip_rect.Min.x = ImMin(merge_clip_rect.Min.x, host_rect.Min.x); merge_clip_rect.Min.x = ImMin(merge_clip_rect.Min.x, host_rect.Min.x);
if ((merge_group_n & 2) == 0 || !has_freeze_v) if ((merge_group_n & 2) == 0 || !has_freeze_v)
merge_clip_rect.Min.y = ImMin(merge_clip_rect.Min.y, host_rect.Min.y); merge_clip_rect.Min.y = ImMin(merge_clip_rect.Min.y, host_rect.Min.y);
if ((merge_group_n & 1) != 0) if ((merge_group_n & 1) != 0 && (table->Flags & ImGuiTableFlags_NoHostExtendX) == 0)
merge_clip_rect.Max.x = ImMax(merge_clip_rect.Max.x, host_rect.Max.x); merge_clip_rect.Max.x = ImMax(merge_clip_rect.Max.x, host_rect.Max.x);
if ((merge_group_n & 2) != 0 && (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0) if ((merge_group_n & 2) != 0 && (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0)
merge_clip_rect.Max.y = ImMax(merge_clip_rect.Max.y, host_rect.Max.y); merge_clip_rect.Max.y = ImMax(merge_clip_rect.Max.y, host_rect.Max.y);