Skip to content

Commit 11116ee

Browse files
committed
Columns: undid the change in 1.75 were Columns()/BeginColumns() were preemptively limited to 64 columns with an assert. (ocornut#3037, ocornut#125)
Essentially reverting 9d44406.
1 parent 3490046 commit 11116ee

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

docs/CHANGELOG.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ Other Changes:
6464
- sizeof(ImWchar) goes from 2 to 4. IM_UNICODE_CODEPOINT_MAX goes from 0xFFFF to 0x10FFFF.
6565
- Various structures such as ImFont, ImFontGlyphRangesBuilder will use more memory, this
6666
is currently not particularly efficient.
67+
- Columns: undid the change in 1.75 were Columns()/BeginColumns() were preemptively limited
68+
to 64 columns with an assert. (#3037, #125)
6769
- Window: Fixed a bug with child window inheriting ItemFlags from their parent when the child
6870
window also manipulate the ItemFlags stack. (#3024) [@Stanbroek]
6971
- Font: Fixed non-ASCII space occasionally creating unnecessary empty polygons.
@@ -121,6 +123,7 @@ Breaking Changes:
121123
- ImDrawList::AddCircle()/AddCircleFilled() functions don't accept negative radius.
122124
- Limiting Columns()/BeginColumns() api to 64 columns with an assert. While the current code
123125
technically supports it, future code may not so we're putting the restriction ahead.
126+
[Undid that change in 1.76]
124127
- imgui_internal.h: changed ImRect() default constructor initializes all fields to 0.0f instead
125128
of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). If you used ImRect::Add() to create bounding boxes by
126129
adding points into it without explicit initialization, you may need to fix your initial value.

imgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ CODE
367367
You can read releases logs https://github.com/ocornut/imgui/releases for more details.
368368
369369
- 2020/01/22 (1.75) - ImDrawList::AddCircle()/AddCircleFilled() functions don't accept negative radius any more.
370-
- 2019/12/17 (1.75) - made Columns() limited to 64 columns by asserting above that limit. While the current code technically supports it, future code may not so we're putting the restriction ahead.
370+
- 2019/12/17 (1.75) - [undid this change in 1.76] made Columns() limited to 64 columns by asserting above that limit. While the current code technically supports it, future code may not so we're putting the restriction ahead.
371371
- 2019/12/13 (1.75) - [imgui_internal.h] changed ImRect() default constructor initializes all fields to 0.0f instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). If you used ImRect::Add() to create bounding boxes by adding multiple points into it, you may need to fix your initial value.
372372
- 2019/12/08 (1.75) - removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017):
373373
- ShowTestWindow() -> use ShowDemoWindow()

imgui_widgets.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7498,8 +7498,8 @@ void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlag
74987498
ImGuiContext& g = *GImGui;
74997499
ImGuiWindow* window = GetCurrentWindow();
75007500

7501-
IM_ASSERT(columns_count >= 1 && columns_count <= 64); // Maximum 64 columns
7502-
IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported
7501+
IM_ASSERT(columns_count >= 1);
7502+
IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported
75037503

75047504
// Acquire storage for the columns set
75057505
ImGuiID id = GetColumnsID(str_id, columns_count);

0 commit comments

Comments
 (0)