commit e489e40a853426767de9ce0637bc0c9ceb431c1e
author GamingMinds-DanielC <daniel.cremers@gamingmindsstudios.com> Mon May 15 14:05:00 2023 +0200
committer ocornut <omarcornut@gmail.com> Mon May 15 14:06:16 2023 +0200
tree 22ff0642efbab10f82201716135e2197865da22f
parent ecb0aaa7c2ae42baf02ce8173ded259789c730e2

Clipper: Amend ecb0aaa (#6424, #3841)

docs/CHANGELOG.txt

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 2f9ea03..ae6b54d 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -38,9 +38,9 @@
 Breaking changes:
 
 - Clipper: Commented out obsolete redirection constructor which was marked obsolete in 1.79:
-   'ImGuiListClipper(int items_count, float items_height)' --> Use 'ImGuiListClipper() + clipper.Begin().clipper.Begin()'.
+   'ImGuiListClipper(int items_count, float items_height)' --> Use 'ImGuiListClipper() + clipper.Begin()'.
 - Clipper: Renamed ForceDisplayRangeByIndices() to IncludeRangeByIndices(), kept
-  inline redirection function (introduced in 1.86 andrarely used). (#6424, #3841)
+  inline redirection function (introduced in 1.86 and rarely used). (#6424, #3841)
 - Backends: GLUT: Removed call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame().
   It needs to be called from the main app loop, like with every other backends. (#6337) [@GereonV]
 

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 558710c..6632a52 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2806,13 +2806,13 @@
     ItemsCount = -1;
 }
 
-void ImGuiListClipper::IncludeRangeByIndices(int item_min, int item_max)
+void ImGuiListClipper::IncludeRangeByIndices(int item_begin, int item_end)
 {
     ImGuiListClipperData* data = (ImGuiListClipperData*)TempData;
     IM_ASSERT(DisplayStart < 0); // Only allowed after Begin() and if there has not been a specified range yet.
-    IM_ASSERT(item_min <= item_max);
-    if (item_min < item_max)
-        data->Ranges.push_back(ImGuiListClipperRange::FromIndices(item_min, item_max));
+    IM_ASSERT(item_begin <= item_end);
+    if (item_begin < item_end)
+        data->Ranges.push_back(ImGuiListClipperRange::FromIndices(item_begin, item_end));
 }
 
 static bool ImGuiListClipper_StepInternal(ImGuiListClipper* clipper)

imgui_internal.h

diff --git a/imgui_internal.h b/imgui_internal.h
index f5befd3..5d78f2c 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -1404,6 +1404,7 @@
 // [SECTION] Clipper support
 //-----------------------------------------------------------------------------
 
+// Note that Max is exclusive, so perhaps should be using a Begin/End convention.
 struct ImGuiListClipperRange
 {
     int     Min;