diff options
| author | Juan Linietsky | 2015-10-17 10:30:08 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-10-17 10:30:08 -0300 |
| commit | 63033aa646f7a49fbcecbc8cc30077cf268be10c (patch) | |
| tree | 80ccf1aed83e6c4d3ed1db2e1d2c0258090f7339 /scene/gui/popup_menu.cpp | |
| parent | ab22203791489df160c36a29a3cd8aa8b32bec04 (diff) | |
| parent | 0d2b28377f1257af039c088f30c11aa0d12cc695 (diff) | |
| download | godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.gz godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.zst godot-63033aa646f7a49fbcecbc8cc30077cf268be10c.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/gui/popup_menu.cpp')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index e70605359..5afe2ed70 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -323,8 +323,10 @@ void PopupMenu::_input_event(const InputEvent &p_event) { invalidated_click=false; break; } - if (over<0 || items[over].separator || items[over].disabled) + if (over<0 || items[over].separator || items[over].disabled) { + hide(); break; //non-activable + } if (items[over].submenu!="") { |