diff options
| author | Unknown <awkor.16@gmail.com> | 2019-02-13 01:31:36 +0100 |
|---|---|---|
| committer | Awkor <awkor.16@gmail.com> | 2019-02-14 23:17:29 +0100 |
| commit | 3236c9a0e7f2ef1b739c427ce93a3926680f8b56 (patch) | |
| tree | d0deba5d216a4ef9cea13f6a57bf762a664d400b /scene | |
| parent | 89eb79aef1aac645358664a8245afe35b30da130 (diff) | |
Fix MenuButton item label disappearing when setting shortcut.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index ac94ac63ec..75307d579e 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -79,7 +79,8 @@ Size2 PopupMenu::get_minimum_size() const { size.width += check_w + hseparation; } - String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text; + String text = items[i].xl_text; + size.width += font->get_string_size(text).width; if (i > 0) size.height += vseparation; @@ -467,7 +468,7 @@ void PopupMenu::_notification(int p_what) { hover->draw(ci, Rect2(item_ofs + Point2(-hseparation, -vseparation / 2), Size2(get_size().width - style->get_minimum_size().width + hseparation * 2, h + vseparation))); } - String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text; + String text = items[i].xl_text; item_ofs.x += items[i].h_ofs; if (items[i].separator) { |