godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21090 from hpvb/fix-19842-redux 

Delay emitting pressed signals in PopupMenu
This commit is contained in:
Juan Linietsky 2018-08-16 17:44:51 -03:00 committed by GitHub
parent 968b31e971 fa7eac8a0d
commit d7b892294b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/popup_menu.cpp
View File

@ -1071,22 +1071,26 @@ void PopupMenu::activate_item(int p_item) {
pop = Object::cast_to<PopupMenu>(next); pop = Object::cast_to<PopupMenu>(next);
} }
emit_signal("id_pressed", id);
emit_signal("index_pressed", p_item);
// Hides popup by default; unless otherwise specified // Hides popup by default; unless otherwise specified
// by using set_hide_on_item_selection and set_hide_on_checkable_item_selection // by using set_hide_on_item_selection and set_hide_on_checkable_item_selection
bool need_hide = true;
if (items[p_item].checkable_type) { if (items[p_item].checkable_type) {
if (!hide_on_checkable_item_selection) if (!hide_on_checkable_item_selection)
return; need_hide = false;
} else if (0 < items[p_item].max_states) { } else if (0 < items[p_item].max_states) {
if (!hide_on_multistate_item_selection) if (!hide_on_multistate_item_selection)
return; need_hide = false;
} else if (!hide_on_item_selection) } else if (!hide_on_item_selection)
return; need_hide = false;
hide(); emit_signal("id_pressed", id);
emit_signal("index_pressed", p_item);
if (need_hide) {
hide();
}
} }
void PopupMenu::remove_item(int p_idx) { void PopupMenu::remove_item(int p_idx) {