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

Merge pull request #26914 from xDGameStudios/popup_menu_add_item 

Fixed optional idx argument in add_item (PopupMenu)
This commit is contained in:
Rémi Verschelde 2019-04-05 16:49:19 +02:00 committed by GitHub
parent e6979adb1b ffc5f360e8
commit 963165065d
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/popup_menu.cpp
View File

@ -594,7 +594,7 @@ void PopupMenu::add_item(const String &p_label, int p_ID, uint32_t p_accel) {
item.text = p_label; item.text = p_label;
item.xl_text = tr(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID == -1 ? items.size() : p_ID;
items.push_back(item); items.push_back(item);
update(); update();
minimum_size_changed(); minimum_size_changed();
@ -632,7 +632,7 @@ void PopupMenu::add_check_item(const String &p_label, int p_ID, uint32_t p_accel
item.text = p_label; item.text = p_label;
item.xl_text = tr(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID == -1 ? items.size() : p_ID;
item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX; item.checkable_type = Item::CHECKABLE_TYPE_CHECK_BOX;
items.push_back(item); items.push_back(item);
update(); update();