mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clipper: hotfix (amend 93cccd2, was broken) (#3841, #1725)

Browse Source
This commit is contained in:
ocornut 2021-11-04 15:14:35 +01:00
parent 64daeddf6f
commit 32779c5b64
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imgui.cpp
View File

@ -2357,7 +2357,7 @@ ImGuiListClipper::ImGuiListClipper()
ImGuiListClipper::~ImGuiListClipper() ImGuiListClipper::~ImGuiListClipper()
{ {
IM_ASSERT(ItemsCount == -1 && "Forgot to call End(), or to Step() until false?"); End();
} }
// Use case A: Begin() called from constructor with items_height<0, then called again from Step() in StepNo 1 // Use case A: Begin() called from constructor with items_height<0, then called again from Step() in StepNo 1
@ -2388,22 +2388,24 @@ void ImGuiListClipper::Begin(int items_count, float items_height)
void ImGuiListClipper::End() void ImGuiListClipper::End()
{ {
ImGuiContext& g = *GImGui;
if (ItemsCount < 0) // Already ended
return;
// In theory here we should assert that we are already at the right position, but it seems saner to just seek at the end and not assert/crash the user. // In theory here we should assert that we are already at the right position, but it seems saner to just seek at the end and not assert/crash the user.
ImGuiListClipperData* data = (ImGuiListClipperData*)TempData; ImGuiContext& g = *GImGui;
if (ItemsCount < INT_MAX && DisplayStart >= 0) if (ItemsCount >= 0 && ItemsCount < INT_MAX && DisplayStart >= 0)
ImGuiListClipper_SeekCursorForItem(this, ItemsCount); ImGuiListClipper_SeekCursorForItem(this, ItemsCount);
ItemsCount = -1; ItemsCount = -1;
data->StepNo = data->Ranges.Size;
// Restore temporary buffer and fix back pointers which may be invalidated when nesting // Restore temporary buffer and fix back pointers which may be invalidated when nesting
IM_ASSERT(g.ClipperTempDataStacked > 0); if (ImGuiListClipperData* data = (ImGuiListClipperData*)TempData)
data = (--g.ClipperTempDataStacked > 0) ? &g.ClipperTempData[g.ClipperTempDataStacked - 1] : NULL; {
if (data) IM_ASSERT(data->ListClipper == this);
data->ListClipper->TempData = data; data->StepNo = data->Ranges.Size;
if (--g.ClipperTempDataStacked > 0)
{
data = &g.ClipperTempData[g.ClipperTempDataStacked - 1];
data->ListClipper->TempData = data;
}
TempData = NULL;
}
} }
bool ImGuiListClipper::Step() bool ImGuiListClipper::Step()