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 2323a7e427cab7cf298f7d0e983bf5d7468abc6d..2c512d3ca08eb4fc921272a46f65ca5e00f97800 100644
(file)
--- a/
src/modalMenu.h
+++ b/
src/modalMenu.h
@@
-1,18
+1,18
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
0
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU
Lesser
General Public License as published by
+the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU
Lesser
General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU
Lesser
General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
@@
-20,7
+20,10
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef MODALMENU_HEADER
#define MODALMENU_HEADER
#ifndef MODALMENU_HEADER
#define MODALMENU_HEADER
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
class GUIModalMenu;
class GUIModalMenu;
@@
-46,6
+49,8
@@
public:
IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
core::rect<s32>(0,0,100,100))
{
IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
core::rect<s32>(0,0,100,100))
{
+ //m_force_regenerate_gui = false;
+
m_menumgr = menumgr;
m_allow_focus_removal = false;
m_screensize_old = v2u32(0,0);
m_menumgr = menumgr;
m_allow_focus_removal = false;
m_screensize_old = v2u32(0,0);
@@
-76,24
+81,33
@@
public:
video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screensize = driver->getScreenSize();
video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screensize = driver->getScreenSize();
- if(screensize != m_screensize_old)
+ if(screensize != m_screensize_old
/*|| m_force_regenerate_gui*/
)
{
m_screensize_old = screensize;
regenerateGui(screensize);
{
m_screensize_old = screensize;
regenerateGui(screensize);
+ //m_force_regenerate_gui = false;
}
drawMenu();
}
/*
}
drawMenu();
}
/*
- This should be called when the menu wants to quit
+ This should be called when the menu wants to quit.
+
+ WARNING: THIS DEALLOCATES THE MENU FROM MEMORY. Return
+ immediately if you call this from the menu itself.
*/
void quitMenu()
{
allowFocusRemoval(true);
// This removes Environment's grab on us
Environment->removeFocus(this);
*/
void quitMenu()
{
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()
@@
-115,14
+129,18
@@
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;
+ v2u32 m_screensize_old;
private:
IMenuManager *m_menumgr;
// This might be necessary to expose to the implementation if it
// wants to launch other menus
bool m_allow_focus_removal;
private:
IMenuManager *m_menumgr;
// This might be necessary to expose to the implementation if it
// wants to launch other menus
bool m_allow_focus_removal;
- v2u32 m_screensize_old;
};
};