diff options
| -rw-r--r-- | scene/animation/animation_player.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/popup_menu.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 86fd1ef14c..992eb365ed 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -938,6 +938,7 @@ void AnimationPlayer::_animation_process(float p_delta) { } else { //stop(); playing = false; + playback.current.pos = 0; _set_process(false); if (end_notify) emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned); 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) { |