diff options
| -rw-r--r-- | modules/mono/utils/string_utils.cpp | 3 | ||||
| -rw-r--r-- | scene/gui/popup_menu.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index 0ef66577fe..1fdddd3925 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -33,6 +33,7 @@ #include "core/os/file_access.h" #include <stdio.h> +#include <stdlib.h> namespace { @@ -210,7 +211,7 @@ String str_format(const char *p_format, ...) { #endif #if defined(MINGW_ENABLED) || defined(_MSC_VER) -#define vsnprintf vsnprintf_s +#define vsnprintf(m_buffer, m_count, m_format, m_argptr) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_argptr) #endif String str_format(const char *p_format, va_list p_list) { diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 8825891807..e77ee8c744 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -93,14 +93,14 @@ Size2 PopupMenu::get_minimum_size() const { if (items[i].submenu != "") size.width += get_icon("submenu")->get_width(); - if (has_check) - size.width += check_w; - max_w = MAX(max_w, size.width + icon_w); + max_w = MAX(max_w, size.width); minsize.height += size.height; } - minsize.width += max_w + accel_max_w; + minsize.width += max_w + icon_w + accel_max_w; + if (has_check) + minsize.width += check_w; return minsize; } |