mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-18 20:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29633 from jbuck3/optionbutton-selection

Browse Source 
Connect OptionButton selection to menu's "index_pressed" signal
This commit is contained in:
Rémi Verschelde 2019-06-17 16:56:16 +02:00 committed by GitHub
commit 1d93b4abef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/option_button.cpp
View File

@ -86,24 +86,7 @@ void OptionButton::_focused(int p_which) {
void OptionButton::_selected(int p_which) {
int selid = -1;
for (int i = 0; i < popup->get_item_count(); i++) {
bool is_clicked = popup->get_item_id(i) == p_which;
if (is_clicked) {
selid = i;
break;
}
}
if (selid == -1 && p_which >= 0 && p_which < popup->get_item_count()) {
_select(p_which, true);
} else {
ERR_FAIL_COND(selid == -1);
_select(selid, true);
}
_select(p_which, true);
}
void OptionButton::pressed() {
@ -355,7 +338,7 @@ OptionButton::OptionButton() {
popup->set_pass_on_modal_close_click(false);
popup->set_notify_transform(true);
popup->set_allow_search(true);
popup->connect("id_pressed", this, "_selected");
popup->connect("index_pressed", this, "_selected");
popup->connect("id_focused", this, "_focused");
popup->connect("popup_hide", this, "set_pressed", varray(false));
}