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

MenuButton: Fix event propagation with dialogs

Browse Source
This commit is contained in:
Ignacio Etcheverry 2016-07-18 23:06:14 +02:00
parent 6a5e11c075
commit c45837cf3f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/menu_button.cpp
View File

@ -28,6 +28,7 @@
/*************************************************************************/ /*************************************************************************/
#include "menu_button.h" #include "menu_button.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "scene/main/viewport.h"
void MenuButton::_unhandled_key_input(InputEvent p_event) { void MenuButton::_unhandled_key_input(InputEvent p_event) {
@ -38,6 +39,9 @@ void MenuButton::_unhandled_key_input(InputEvent p_event) {
if (!get_parent() || !is_visible() || is_disabled()) if (!get_parent() || !is_visible() || is_disabled())
return; return;
if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this))
return; //ignore because of modal window
if (popup->activate_item_by_event(p_event)) if (popup->activate_item_by_event(p_event))
accept_event(); accept_event();