Merge remote branch 'origin/master'

[dragonfireclient.git] / src / guiMessageMenu.cpp

diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index 155be6029c8b0f08174a121e8bb50c4d44617853..c6592e51cf4da5fbac9c9f83a86aa942463c29c7 100644 (file)
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 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.
 */
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "serialization.h"
 #include <string>
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
 
 #include "gettext.h"
 
@@ -76,23 +81,37 @@ void GUIMessageMenu::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, 400, 50);
-               rect = rect + v2s32(size.X/2-400/2, size.Y/2-50/2-25);
-               Environment->addStaticText(m_message_text.c_str(), rect, false,
-                               true, this, 256);
+               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);
        }
+       changeCtype("");
+       int bw = 140;
        {
-               core::rect<s32> rect(0, 0, 140, 30);
-               rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
+               core::rect<s32> rect(0, 0, bw, 30);
+               rect = rect + v2s32(size.X/2-bw/2, size.Y/2-30/2+5 + msg_h/2);
+               wchar_t* text = wgettext("Proceed");
                gui::IGUIElement *e = 
                Environment->addButton(rect, this, 257,
-                       chartowchar_t(gettext("Proceed")));
+                       text);
                Environment->setFocus(e);
+               delete[] text;
        }
+       changeCtype("C");
 }
 
 void GUIMessageMenu::drawMenu()