asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #5790 from neikeq/pr-issue-1149

Browse source 
MenuButton: Fix event propagation with dialogs
This commit is contained in:
Rémi Verschelde 2016-07-19 07:36:25 +02:00 • committed by GitHub
commit 569541bafc
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 "os/keyboard.h"
#include "scene/main/viewport.h"
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())
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))
accept_event();