summaryrefslogtreecommitdiffstats
path: root/scene/gui/menu_button.cpp
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2016-04-06 15:37:57 +0300
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2016-04-06 15:42:50 +0300
commitb7d79c93f47c6d5e6d9e4f50c546cd521866703a (patch)
tree8372b1c273237477661dc8fed3328c93ea9fdaeb /scene/gui/menu_button.cpp
parent4af1839073261d913ef53bb6f81d2a0cb486d39b (diff)
downloadredot-engine-b7d79c93f47c6d5e6d9e4f50c546cd521866703a.tar.gz
Fix PopupMenu and MenuButton not activating items with shortcut inside submenus
Diffstat (limited to 'scene/gui/menu_button.cpp')
-rw-r--r--scene/gui/menu_button.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index cb8806e2ef..0f415f013d 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -53,23 +53,7 @@ void MenuButton::_unhandled_key_input(InputEvent p_event) {
code|=KEY_MASK_SHIFT;
- int item = popup->find_item_by_accelerator(code);
-
-
- if (item>=0 && ! popup->is_item_disabled(item))
- popup->activate_item(item);
- /*
- for(int i=0;i<items.size();i++) {
-
-
- if (items[i].accel==0)
- continue;
-
- if (items[i].accel==code) {
-
- emit_signal("item_pressed",items[i].ID);
- }
- }*/
+ int item = popup->activate_item_by_accelerator(code);
}
}