Add Client::getEnv() and remove some unnecessary wrappers

[minetest.git] / src / modalMenu.h

diff --git a/src/modalMenu.h b/src/modalMenu.h
index 2323a7e427cab7cf298f7d0e983bf5d7468abc6d..21d9a479ef0af8090afb8f3f73a0d8ca9a43189b 100644 (file)
--- a/src/modalMenu.h
+++ b/src/modalMenu.h
@@ -46,6 +46,8 @@ class GUIModalMenu : public gui::IGUIElement
                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);
@@ -76,17 +78,21 @@ class GUIModalMenu : public gui::IGUIElement
                        
                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_force_regenerate_gui = false;
                }
 
                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()
        {
@@ -116,13 +122,15 @@ class GUIModalMenu : public gui::IGUIElement
        virtual void regenerateGui(v2u32 screensize) = 0;
        virtual void drawMenu() = 0;
        virtual bool OnEvent(const SEvent& event) { return false; };
-       
+
+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;
-       v2u32 m_screensize_old;
 };