Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-06-02 11:06:51 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

MultiSelect: fixed an issue caused by previous commit.

Browse Source 
Amend a285835. Breaks box-select.
This commit is contained in:
ocornut
2024-07-24 19:14:54 +02:00
parent a285835ac4
commit 237165a935
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui_widgets.cpp
+4 -2
View File
@@ -7424,7 +7424,11 @@ ImGuiMultiSelectIO* ImGui::BeginMultiSelect(ImGuiMultiSelectFlags flags, int sel
} }
if (request_clear || request_select_all) if (request_clear || request_select_all)
{
MultiSelectAddSetAll(ms, request_select_all); MultiSelectAddSetAll(ms, request_select_all);
if (!request_select_all)
storage->LastSelectionSize = 0;
}
ms->LoopRequestSetAll = request_select_all ? 1 : request_clear ? 0 : -1; ms->LoopRequestSetAll = request_select_all ? 1 : request_clear ? 0 : -1;
ms->LastSubmittedItem = ImGuiSelectionUserData_Invalid; ms->LastSubmittedItem = ImGuiSelectionUserData_Invalid;
@@ -7810,8 +7814,6 @@ void ImGui::MultiSelectAddSetAll(ImGuiMultiSelectTempData* ms, bool selected)
ImGuiSelectionRequest req = { ImGuiSelectionRequestType_SetAll, selected, 0, ImGuiSelectionUserData_Invalid, ImGuiSelectionUserData_Invalid }; ImGuiSelectionRequest req = { ImGuiSelectionRequestType_SetAll, selected, 0, ImGuiSelectionUserData_Invalid, ImGuiSelectionUserData_Invalid };
ms->IO.Requests.resize(0); // Can always clear previous requests ms->IO.Requests.resize(0); // Can always clear previous requests
ms->IO.Requests.push_back(req); // Add new request ms->IO.Requests.push_back(req); // Add new request
if (selected == false)
ms->Storage->LastSelectionSize = 0;
} }
void ImGui::MultiSelectAddSetRange(ImGuiMultiSelectTempData* ms, bool selected, int range_dir, ImGuiSelectionUserData first_item, ImGuiSelectionUserData last_item) void ImGui::MultiSelectAddSetRange(ImGuiMultiSelectTempData* ms, bool selected, int range_dir, ImGuiSelectionUserData first_item, ImGuiSelectionUserData last_item)