Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-26 05:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clipper: Amend ecb0aaa (#6424, #3841)

Browse Source
This commit is contained in:
GamingMinds-DanielC 2023-05-15 14:05:00 +02:00 committed by ocornut
parent ecb0aaa7c2
commit e489e40a85
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.txt
View File

@ -38,9 +38,9 @@ HOW TO UPDATE?
Breaking changes: Breaking changes:
- Clipper: Commented out obsolete redirection constructor which was marked obsolete in 1.79: - 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 - 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(). - 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] It needs to be called from the main app loop, like with every other backends. (#6337) [@GereonV]

8
imgui.cpp
View File

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

1
imgui_internal.h
View File

@ -1404,6 +1404,7 @@ enum ImGuiInputFlags_
// [SECTION] Clipper support // [SECTION] Clipper support
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Note that Max is exclusive, so perhaps should be using a Begin/End convention.
struct ImGuiListClipperRange struct ImGuiListClipperRange
{ {
int Min; int Min;