summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-05-02 17:12:37 +0200
committerGitHub <noreply@github.com>2019-05-02 17:12:37 +0200
commitb0931806c2a085e84ecc4d7989436edc83cd70a8 (patch)
tree2757c6fe21cecfbfac44e050d2cf58486fda196e /scene
parent0eb924a425281dfae4672ec114dc42b4067205ec (diff)
parentd6489374e76ff0ac050b240e78810552a5399a8e (diff)
Merge pull request #28611 from YeldhamDev/popupmenu_regressionmania
Fix regression in 'PopupMenu' when icons have different values for width and height
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/popup_menu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index e77ee8c744..5df18cece6 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -449,7 +449,7 @@ void PopupMenu::_notification(int p_what) {
for (int i = 0; i < items.size(); i++) {
if (!items[i].icon.is_null())
- icon_ofs = MAX(items[i].icon->get_size().height, icon_ofs);
+ icon_ofs = MAX(items[i].icon->get_size().width, icon_ofs);
if (items[i].checkable_type)
has_check = true;