godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Small PopupMenu changes

Browse Source
This commit is contained in:
neikeq
2015-11-05 15:22:50 +01:00
parent d123c89c58
commit ae65dfa4ec
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/gui/popup_menu.cpp
View File

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