asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #25064 from homer666/itemlist-adjust-ui_select-precedence

Browse source 
ItemList: ignore `ui_select` action if Select Mode is not "Multi"
This commit is contained in:
Rémi Verschelde 2019-01-21 17:45:30 +01:00 • committed by GitHub
commit 055456d5fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/gui/item_list.cpp
View file

@ -715,9 +715,9 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) {
} }
} else if (p_event->is_action("ui_cancel")) { } else if (p_event->is_action("ui_cancel")) {
search_string = ""; search_string = "";
} else if (p_event->is_action("ui_select")) { } else if (p_event->is_action("ui_select") && select_mode == SELECT_MULTI) {
if (select_mode == SELECT_MULTI && current >= 0 && current < items.size()) { if (current >= 0 && current < items.size()) {
if (items[current].selectable && !items[current].disabled && !items[current].selected) { if (items[current].selectable && !items[current].disabled && !items[current].selected) {
select(current, false); select(current, false);
emit_signal("multi_selected", current, true); emit_signal("multi_selected", current, true);