diff options
author | Michael Alexsander Silva Dias <michaelalexsander@protonmail.com> | 2019-05-01 02:30:56 -0300 |
---|---|---|
committer | Michael Alexsander Silva Dias <michaelalexsander@protonmail.com> | 2019-05-01 02:30:56 -0300 |
commit | 48bfa9d17a69a8722556eb3a42df73348f46695c (patch) | |
tree | 1cac4de5529abfd474fa49332b62e43a22898c08 /scene | |
parent | dd2cd06165670bb0d78bf4aa397935be15716e76 (diff) |
Fix regression on 'PopupMenu's minimal size
Diffstat (limited to 'scene')
-rw-r--r-- | scene/gui/popup_menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |