Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Small PopupMenu changes

2.0
neikeq 2015-11-05 15:22:50 +07:00
parent d123c89c58
commit ae65dfa4ec
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/gui/popup_menu.cpp
Unescape Escape View File

@ -323,11 +323,14 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
invalidated_click=false;
break;
}
if (over<0 || items[over].separator || items[over].disabled) {
if (over<0) {
hide();
break; //non-activable
}
if (items[over].separator || items[over].disabled)
break;
if (items[over].submenu!="") {
_activate_submenu(over);
@ -362,8 +365,11 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
int over=_get_mouse_over(Point2(m.x,m.y));
int id = (over<0 || items[over].separator || items[over].disabled)?-1:items[over].ID;
if (id<0)
if (id<0) {
mouse_over=-1;
update();
break;
}
if (items[over].submenu!="" && submenu_over!=over) {
submenu_over=over;