diff options
| author | Juan Linietsky | 2016-06-04 21:31:29 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-06-04 21:31:47 -0300 |
| commit | 007efb6a20dcaa9230f1cfdc1cda92db24c5510f (patch) | |
| tree | db29be67ba32768ba96037d06c82cb8f1ac7f1c2 /scene/gui/menu_button.cpp | |
| parent | 279b7921e8dc8feb44a7650b983f6b3878a01d14 (diff) | |
| download | godot-007efb6a20dcaa9230f1cfdc1cda92db24c5510f.tar.gz godot-007efb6a20dcaa9230f1cfdc1cda92db24c5510f.tar.zst godot-007efb6a20dcaa9230f1cfdc1cda92db24c5510f.zip | |
Diffstat (limited to 'scene/gui/menu_button.cpp')
| -rw-r--r-- | scene/gui/menu_button.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 0e39ee8a7..28d67287d 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -32,30 +32,15 @@ void MenuButton::_unhandled_key_input(InputEvent p_event) { - //check accelerators - if (p_event.type==InputEvent::KEY && p_event.key.pressed) { + if (p_event.is_pressed() && !p_event.is_echo() && (p_event.type==InputEvent::KEY || p_event.type==InputEvent::ACTION || p_event.type==InputEvent::JOYSTICK_BUTTON)) { if (!get_parent() || !is_visible() || is_disabled()) return; - uint32_t code=p_event.key.scancode; - if (code==0) - code=p_event.key.unicode; - if (p_event.key.mod.control) - code|=KEY_MASK_CTRL; - if (p_event.key.mod.alt) - code|=KEY_MASK_ALT; - if (p_event.key.mod.meta) - code|=KEY_MASK_META; - if (p_event.key.mod.shift) - code|=KEY_MASK_SHIFT; - - - int item = popup->activate_item_by_accelerator(code); + int item = popup->activate_item_by_event(p_event); } - } |