projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
modalMenu.h
diff --git
a/src/modalMenu.h
b/src/modalMenu.h
index d19b4e27cb4d33e0966d7313cbd08a9e0b6e2053..2c512d3ca08eb4fc921272a46f65ca5e00f97800 100644
(file)
--- a/
src/modalMenu.h
+++ b/
src/modalMenu.h
@@
-21,6
+21,9
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#define MODALMENU_HEADER
#include "irrlichttypes_extrabloated.h"
#define MODALMENU_HEADER
#include "irrlichttypes_extrabloated.h"
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
class GUIModalMenu;
class GUIModalMenu;
@@
-99,7
+102,12
@@
public:
allowFocusRemoval(true);
// This removes Environment's grab on us
Environment->removeFocus(this);
allowFocusRemoval(true);
// This removes Environment's grab on us
Environment->removeFocus(this);
+ m_menumgr->deletingMenu(this);
this->remove();
this->remove();
+#ifdef HAVE_TOUCHSCREENGUI
+ if (g_touchscreengui)
+ g_touchscreengui->Show();
+#endif
}
void removeChildren()
}
void removeChildren()
@@
-121,7
+129,9
@@
public:
virtual void regenerateGui(v2u32 screensize) = 0;
virtual void drawMenu() = 0;
virtual void regenerateGui(v2u32 screensize) = 0;
virtual void drawMenu() = 0;
+ virtual bool preprocessEvent(const SEvent& event) { return false; };
virtual bool OnEvent(const SEvent& event) { return false; };
virtual bool OnEvent(const SEvent& event) { return false; };
+ virtual bool pausesGame(){ return false; } // Used for pause menu
protected:
//bool m_force_regenerate_gui;
protected:
//bool m_force_regenerate_gui;