Don't erase modified_blocks

[minetest.git] / src / guiConfirmMenu.cpp

diff --git a/src/guiConfirmMenu.cpp b/src/guiConfirmMenu.cpp
index 2ca4e1791642d2e6f6c6f7b2adfb56e6ba7270d9..70e33c760158dc963daff10bbb3b3a3efe361f3e 100644 (file)
--- a/src/guiConfirmMenu.cpp
+++ b/src/guiConfirmMenu.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
-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.
 */
@@ -93,12 +93,21 @@ void GUIConfirmMenu::regenerateGui(v2u32 screensize)
 
        v2s32 size = rect.getSize();
 
+       gui::IGUISkin *skin = Environment->getSkin();
+       gui::IGUIFont *font = skin->getFont();
+       s32 msg_h = font->getDimension(m_message_text.c_str()).Height;
+       s32 msg_w = font->getDimension(m_message_text.c_str()).Width;
+       if(msg_h > 200)
+               msg_h = 200;
+       if(msg_w > 540)
+               msg_w = 540;
+
        /*
                Add stuff
        */
        {
-               core::rect<s32> rect(0, 0, 300, 20);
-               rect += v2s32(size.X/2-300/2, size.Y/2-30/2-25);
+               core::rect<s32> rect(0, 0, msg_w, msg_h);
+               rect += v2s32(size.X/2-msg_w/2, size.Y/2-30/2 - msg_h/2);
                Environment->addStaticText(m_message_text.c_str(),
                        rect, false, true, this, -1);
        }
@@ -106,15 +115,15 @@ void GUIConfirmMenu::regenerateGui(v2u32 screensize)
        int bw = 100;
        {
                core::rect<s32> rect(0, 0, bw, 30);
-               rect = rect + v2s32(size.X/2-bw/2-bw/2-5, size.Y/2-30/2+25);
-               Environment->addButton(rect, this, GUI_ID_NO,
-                       wgettext("No"));
+               rect = rect + v2s32(size.X/2-bw/2-(bw/2+5), size.Y/2-30/2+5 + msg_h/2);
+               Environment->addButton(rect, this, GUI_ID_YES,
+                       wgettext("Yes"));
        }
        {
                core::rect<s32> rect(0, 0, bw, 30);
-               rect = rect + v2s32(size.X/2-bw/2+bw/2+5, size.Y/2-30/2+25);
-               Environment->addButton(rect, this, GUI_ID_YES,
-                       wgettext("Yes"));
+               rect = rect + v2s32(size.X/2-bw/2+(bw/2+5), size.Y/2-30/2+5 + msg_h/2);
+               Environment->addButton(rect, this, GUI_ID_NO,
+                       wgettext("No"));
        }
        changeCtype("C");
 }