Skip to content

Commit cbb8edb

Browse files
committed
Tables: fixed an assert when combining Tables, Frozen Rows, Clipper and BeginMultiSelect() in a certain order. (#8595, #8250)
The table->CurrentColumn != -1 test in BeginMultiSelect() was affected. It would have been possible to amend the test with table->IsInsideRow but this seems generally saner. Docs: fixed typo. (#8592)
1 parent 75964a9 commit cbb8edb

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

docs/CHANGELOG.txt

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ Other changes:
7878
- TreeNode: fixed incorrect clipping of arrow/bullet when using ImGuiTreeNodeFlags_SpanAllColumns.
7979
- Tables: fixed TableHeader() eager vertical clipping of text which may be noticeable
8080
with FramePadding.y was too small. (#6236)
81+
- Tables: fixed an assert when combining Tables, Frozen Rows, Clipper and BeginMultiSelect()
82+
in a certain order. (#8595, #8250)
8183
- Tabs: fixes small issues with how "..." ellipsis moved depending on visibility
8284
of Close Button or Unsaved Document marker. (#8387)
8385
- Nav: fixed assertion when holding gamepad FaceLeft/West button to open

docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ See the [Getting Started](https://github.com/ocornut/imgui/wiki/Getting-Started)
120120

121121
On most platforms and when using C++, **you should be able to use a combination of the [imgui_impl_xxxx](https://github.com/ocornut/imgui/tree/master/backends) backends without modification** (e.g. `imgui_impl_win32.cpp` + `imgui_impl_dx11.cpp`). If your engine supports multiple platforms, consider using more imgui_impl_xxxx files instead of rewriting them: this will be less work for you, and you can get Dear ImGui running immediately. You can _later_ decide to rewrite a custom backend using your custom engine functions if you wish so.
122122

123-
Integrating Dear ImGui within your custom engine is a matter of 1) wiring mouse/keyboard/gamepad inputs 2) uploading a texture to your GPU/render engine 3) providing a render function that can bind textures and render textured triangles, which is essentially what Backends are doing. The [examples/](https://github.com/ocornut/imgui/tree/master/examples) folder is populated with applications doing just that: setting up a window and using backends. If you follow the [Getting Started](https://github.com/ocornut/imgui/wiki/Getting-Started) guide it should in theory takes you less than an hour to integrate Dear ImGui. **Make sure to spend time reading the [FAQ](https://www.dearimgui.com/faq), comments, and the examples applications!**
123+
Integrating Dear ImGui within your custom engine is a matter of 1) wiring mouse/keyboard/gamepad inputs 2) uploading a texture to your GPU/render engine 3) providing a render function that can bind textures and render textured triangles, which is essentially what Backends are doing. The [examples/](https://github.com/ocornut/imgui/tree/master/examples) folder is populated with applications doing just that: setting up a window and using backends. If you follow the [Getting Started](https://github.com/ocornut/imgui/wiki/Getting-Started) guide it should in theory take you less than an hour to integrate Dear ImGui. **Make sure to spend time reading the [FAQ](https://www.dearimgui.com/faq), comments, and the examples applications!**
124124

125125
Officially maintained backends/bindings (in repository):
126126
- Renderers: DirectX9, DirectX10, DirectX11, DirectX12, Metal, OpenGL/ES/ES2, SDL_GPU, SDL_Renderer2/3, Vulkan, WebGPU.

imgui_tables.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,10 @@ void ImGui::TableEndRow(ImGuiTable* table)
19531953
IM_ASSERT(table->IsInsideRow);
19541954

19551955
if (table->CurrentColumn != -1)
1956+
{
19561957
TableEndCell(table);
1958+
table->CurrentColumn = -1;
1959+
}
19571960

19581961
// Logging
19591962
if (g.LogEnabled)

0 commit comments

Comments
 (0)