Revert "Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. (#125, #2666)"
This reverts commit 6c16ba649092bc90e219d30990f53ee8c59abc7c.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index d60e7cd..10d36d0 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -58,9 +58,6 @@
- TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).
- Columns: Fixed a regression from 1.71 where the right-side of the contents rectangle within each column
would wrongly use a WindowPadding.x instead of ItemSpacing.x like it always did. (#125, #2666)
-- Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and
- WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while
- ensuring that the right-most column clipping width matches others. (#125, #2666)
- Word-wrapping: Fixed overzealous word-wrapping when glyph edge lands exactly on the limit. Because
of this, auto-fitting exactly unwrapped text would make it wrap. (fixes initial 1.15 commit, 78645a7d).
- Scrolling: Added SetScrollHereX(), SetScrollFromPosX() for completeness. (#1580) [@kevreco]
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 61ed226..2505742 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -7294,19 +7294,18 @@
columns->Flags = flags;
window->DC.CurrentColumns = columns;
+ // Set state for first column
+ const float column_padding = g.Style.ItemSpacing.x;
+ columns->OffMinX = window->DC.Indent.x - column_padding;
+ columns->OffMaxX = window->WorkRect.Max.x - window->Pos.x;
+ columns->OffMaxX = ImMax(columns->OffMaxX, columns->OffMinX + 1.0f);
columns->HostCursorPosY = window->DC.CursorPos.y;
columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
columns->HostClipRect = window->ClipRect;
columns->HostWorkRect = window->WorkRect;
-
- // Set state for first column
- // We aim so that the right-most column will have the same clipping width as other after being clipped by parent ClipRect
- const float column_padding = g.Style.ItemSpacing.x;
- const float half_clip_extend_x = ImFloor(ImMax(window->WindowPadding.x * 0.5f, window->WindowBorderSize));
- columns->OffMinX = window->DC.Indent.x - column_padding + ImMax(column_padding - window->WindowPadding.x, 0.0f);
- columns->OffMaxX = ImMin(window->WorkRect.Max.x + column_padding - ImMax(column_padding - window->WindowPadding.x, 0.0f), window->WorkRect.Max.x + half_clip_extend_x) - window->Pos.x;
- columns->OffMaxX = ImMax(columns->OffMaxX, columns->OffMinX + 1.0f);
columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
+ window->DC.ColumnsOffset.x = 0.0f;
+ window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
// Clear data if columns count changed
if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1)
@@ -7346,8 +7345,6 @@
float offset_1 = GetColumnOffset(columns->Current + 1);
float width = offset_1 - offset_0;
PushItemWidth(width * 0.65f);
- window->DC.ColumnsOffset.x = columns->OffMinX - window->DC.Indent.x + column_padding;
- window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
}
@@ -7382,7 +7379,7 @@
{
// New row/line
// Column 0 honor IndentX
- window->DC.ColumnsOffset.x = columns->OffMinX - window->DC.Indent.x + column_padding;
+ window->DC.ColumnsOffset.x = 0.0f;
window->DrawList->ChannelsSetCurrent(1);
columns->Current = 0;
columns->LineMinY = columns->LineMaxY;
