mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Combo: simplified Combo() API uses a list clipper.

Browse source 
Wasn't as trivial before supporting IncludeItemByIndex().
This commit is contained in:
ocornut 2024-05-28 18:18:35 +02:00
parent 51823d117d
commit 109a8632d7
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGELOG.txt
View file

@ -47,6 +47,8 @@ Other changes:
responsible for honoring io.ConfigWindowsMoveFromTitleBarOnly. (#7576, #899) responsible for honoring io.ConfigWindowsMoveFromTitleBarOnly. (#7576, #899)
- Scrollbar: made scrolling logic more standard: clicking above or below the - Scrollbar: made scrolling logic more standard: clicking above or below the
grab scrolls by one page, holding mouse button repeats scrolling. (#7328, #150) grab scrolls by one page, holding mouse button repeats scrolling. (#7328, #150)
- Combo: simplified Combo() API uses a list clipper (due to its api it wasn't
previously trivial before we added clipper.IncludeItemByIndex() function).
- Misc: made ImGuiDir and ImGuiSortDirection stronger-typed enums. - Misc: made ImGuiDir and ImGuiSortDirection stronger-typed enums.

1
docs/TODO.txt
View file

@ -151,7 +151,6 @@ It's mostly a bunch of personal notes, probably incomplete. Feel free to query i
- drag float: added leeway on edge (e.g. a few invisible steps past the clamp limits) - drag float: added leeway on edge (e.g. a few invisible steps past the clamp limits)
- combo: a way/helper to customize the combo preview (#1658) -> experimental BeginComboPreview() - combo: a way/helper to customize the combo preview (#1658) -> experimental BeginComboPreview()
- combo: Combo() helper could use clipper.
- combo/listbox: keyboard control. need InputText-like non-active focus + key handling. considering keyboard for custom listbox (pr #203) - combo/listbox: keyboard control. need InputText-like non-active focus + key handling. considering keyboard for custom listbox (pr #203)
- listbox: multiple selection (WIP range-select branch) - listbox: multiple selection (WIP range-select branch)
- listbox: unselect option (#1208) - listbox: unselect option (#1208)

9
imgui_widgets.cpp
View file

@ -1952,9 +1952,12 @@ bool ImGui::Combo(const char* label, int* current_item, const char* (*getter)(vo
return false; return false;
// Display items // Display items
// FIXME-OPT: Use clipper (but we need to disable it on the appearing frame to make sure our call to SetItemDefaultFocus() is processed)
bool value_changed = false; bool value_changed = false;
for (int i = 0; i < items_count; i++) ImGuiListClipper clipper;
clipper.Begin(items_count);
clipper.IncludeItemByIndex(*current_item);
while (clipper.Step())
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
{ {
const char* item_text = getter(user_data, i); const char* item_text = getter(user_data, i);
if (item_text == NULL) if (item_text == NULL)
@ -1973,7 +1976,6 @@ bool ImGui::Combo(const char* label, int* current_item, const char* (*getter)(vo
} }
EndCombo(); EndCombo();
if (value_changed) if (value_changed)
MarkItemEdited(g.LastItemData.ID); MarkItemEdited(g.LastItemData.ID);
@ -7011,6 +7013,7 @@ bool ImGui::ListBox(const char* label, int* current_item, const char* (*getter)(
bool value_changed = false; bool value_changed = false;
ImGuiListClipper clipper; ImGuiListClipper clipper;
clipper.Begin(items_count, GetTextLineHeightWithSpacing()); // We know exactly our line height here so we pass it as a minor optimization, but generally you don't need to. clipper.Begin(items_count, GetTextLineHeightWithSpacing()); // We know exactly our line height here so we pass it as a minor optimization, but generally you don't need to.
clipper.IncludeItemByIndex(*current_item);
while (clipper.Step()) while (clipper.Step())
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
{ {