diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-07 00:19:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 00:19:22 +0100 |
| commit | ca439056a668d7eca01ac72d769f1b16587da53d (patch) | |
| tree | ba961b6cf97c03378e3ff19da41273c49230969e /scene/gui | |
| parent | a7440cd81ae391993fbee85a6a260ca6dd41f09b (diff) | |
| parent | 6629cc7a85475d34f96e582c0dfd4b8b30ef92d3 (diff) | |
Merge pull request #14328 from YeldhamDev/popupmenu_submenu_fix
Fixed PopupMenu's submenus not showing up in certain situations
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index f3711b86b6..4ee6f93c9a 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -202,10 +202,10 @@ void PopupMenu::_activate_submenu(int over) { void PopupMenu::_submenu_timeout() { - if (mouse_over == submenu_over) { + if (mouse_over == submenu_over) _activate_submenu(mouse_over); - submenu_over = -1; - } + + submenu_over = -1; } void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { |