godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14328 from YeldhamDev/popupmenu_submenu_fix

Browse Source 
Fixed PopupMenu's submenus not showing up in certain situations
This commit is contained in:
Rémi Verschelde 2017-12-07 00:19:22 +01:00 committed by GitHub
commit ca439056a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/popup_menu.cpp
View File

@ -202,10 +202,10 @@ void PopupMenu::_activate_submenu(int over) {
void PopupMenu::_submenu_timeout() { void PopupMenu::_submenu_timeout() {
if (mouse_over == submenu_over) { if (mouse_over == submenu_over)
_activate_submenu(mouse_over); _activate_submenu(mouse_over);
submenu_over = -1;
} submenu_over = -1;
} }
void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {