summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 10:28:20 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 10:28:20 -0300
commit0d2b28377f1257af039c088f30c11aa0d12cc695 (patch)
tree639204ad001bfb8f58a938b33934483c7d9b22bd /scene
parent1d800a681b0837503b4b6f5860da9e68364018a0 (diff)
parent930cb97c7d5e1bd4946564c97ea636ca3ed81963 (diff)
Merge pull request #2455 from firefly2442/hide-menu-fix
[UI fix] Hide opened menu when click on menu button
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/popup_menu.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index e706053592..5afe2ed704 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!="") {