mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-21 16:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MultiSelect: Demo sharing selection helper code. Fixed static analyzer warnings.

Browse Source
This commit is contained in:
omar
2019-12-21 23:21:23 +01:00
committed by ocornut
parent 57da88093f
commit 17c4c2154a
3 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
imgui_widgets.cpp
View File

@@ -7248,10 +7248,10 @@ void ImGui::MultiSelectItemFooter(ImGuiID id, bool* p_selected, bool* p_pressed)
// Auto-select as you navigate a list
if (g.NavJustMovedToId == id)
{
if (!g.IO.KeyCtrl)
selected = pressed = true;
else if (g.IO.KeyCtrl && g.IO.KeyShift)
if (is_ctrl && is_shift)
pressed = true;
else if (!is_ctrl)
selected = pressed = true;
}
// Right-click handling: this could be moved at the Selectable() level.
@@ -7320,9 +7320,9 @@ void ImGui::MultiSelectItemFooter(ImGuiID id, bool* p_selected, bool* p_pressed)
}
else if (input_source == ImGuiInputSource_Keyboard || input_source == ImGuiInputSource_Gamepad)
{
if (!is_multiselect)
if (is_multiselect && is_shift && !is_ctrl)
ms->Out.RequestClear = true;
else if (is_shift && !is_ctrl && is_multiselect)
else if (!is_multiselect)
ms->Out.RequestClear = true;
}
}