Don't open debug menu if there is dialog window.

The modal dialog eats gui close event, which is quite annoying.
Also return event block as long as debug menu is opened.
This commit is contained in:
Deve
2019-01-14 23:27:36 +01:00
parent 7bb8cc2706
commit d1fc7732c3

View File

@@ -34,6 +34,8 @@
#include "graphics/sp/sp_shader.hpp"
#include "graphics/sp/sp_texture_manager.hpp"
#include "graphics/sp/sp_uniform_assigner.hpp"
#include "guiengine/modaldialog.hpp"
#include "guiengine/screen_keyboard.hpp"
#include "guiengine/widgets/label_widget.hpp"
#include "guiengine/widgets/text_box_widget.hpp"
#include "items/powerup_manager.hpp"
@@ -873,6 +875,10 @@ bool onEvent(const SEvent &event)
if (event.EventType == EET_MOUSE_INPUT_EVENT)
{
if (GUIEngine::ModalDialog::isADialogActive() ||
GUIEngine::ScreenKeyboard::isActive())
return true;
// Create the menu (only one menu at a time)
#ifdef ANDROID
if (event.MouseInput.X < 30 && event.MouseInput.Y < 30 &&
@@ -1022,7 +1028,9 @@ bool onEvent(const SEvent &event)
return false;
}
}
return true; // continue event handling
// continue event handling if menu is not opened
return !g_debug_menu_visible;
} // onEvent
// ----------------------------------------------------------------------------