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

Merge pull request #61181 from akien-mga/3.x-fix-PopupMenu-regression

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-19 11:55:00 +02:00 committed by GitHub
commit 6f6c5b79e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/popup_menu.cpp
View file

@ -666,7 +666,7 @@ void PopupMenu::_notification(int p_what) {
#define ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel) \ #define ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel) \
item.text = p_label; \ item.text = p_label; \
item.xl_text = tr(p_label); \ item.xl_text = tr(p_label); \
item.id = p_id == -1 ? items.size() - 1 : p_id; \ item.id = p_id == -1 ? items.size() : p_id; \
item.accel = p_accel; item.accel = p_accel;
void PopupMenu::add_item(const String &p_label, int p_id, uint32_t p_accel) { void PopupMenu::add_item(const String &p_label, int p_id, uint32_t p_accel) {
@ -739,7 +739,7 @@ void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int
_ref_shortcut(p_shortcut); \ _ref_shortcut(p_shortcut); \
item.text = p_shortcut->get_name(); \ item.text = p_shortcut->get_name(); \
item.xl_text = tr(item.text); \ item.xl_text = tr(item.text); \
item.id = p_id == -1 ? items.size() - 1 : p_id; \ item.id = p_id == -1 ? items.size() : p_id; \
item.shortcut = p_shortcut; \ item.shortcut = p_shortcut; \
item.shortcut_is_global = p_global; item.shortcut_is_global = p_global;
@ -802,7 +802,7 @@ void PopupMenu::add_submenu_item(const String &p_label, const String &p_submenu,
Item item; Item item;
item.text = p_label; item.text = p_label;
item.xl_text = tr(p_label); item.xl_text = tr(p_label);
item.id = p_id == -1 ? items.size() - 1 : p_id; item.id = p_id == -1 ? items.size() : p_id;
item.submenu = p_submenu; item.submenu = p_submenu;
items.push_back(item); items.push_back(item);
update(); update();