diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-05 16:49:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 16:49:19 +0200 |
| commit | 963165065df185e6e1727596c743c1bc7e4aa49b (patch) | |
| tree | a803c3cf36865182af0f67bd1f88e8fa135b067a /scene/gui | |
| parent | e6979adb1bb4740ffaaaa9f7efed49a9b0577ec0 (diff) | |
| parent | ffc5f360e8578140b9b43d6b4f6483931ee7aaeb (diff) | |
Merge pull request #26914 from xDGameStudios/popup_menu_add_item
Fixed optional idx argument in add_item (PopupMenu)
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 28b124d143..94c73b2e42 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -594,7 +594,7 @@ void PopupMenu::add_item(const String &p_label, int p_ID, uint32_t p_accel) { item.text = p_label; item.xl_text = tr(p_label); item.accel = p_accel; - item.ID = p_ID; + item.ID = p_ID == -1 ? items.size() : p_ID; items.push_back(item); update(); 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.xl_text = tr(p_label); 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; items.push_back(item); update(); |