Fix invalid usage of texture->getSize() where actually texture->getOriginalSize(...

[minetest.git] / src / guiTextInputMenu.cpp

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index f4e3bb5ba08aa9200073b0e3f028c1a3ab10602e..9285aaa817d3ab7c6c3ce819fac619fd17cc33f1 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -20,6 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiTextInputMenu.h"
 #include "debug.h"
 #include "serialization.h"
+#include "main.h" // for g_settings
+#include "settings.h"
 #include <string>
 #include <IGUICheckBox.h>
 #include <IGUIEditBox.h>
@@ -109,11 +111,16 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 300, 30);
                rect = rect + v2s32(size.X/2-300/2, size.Y/2-30/2-25);
+               gui::IGUIElement *e;
                #if USE_FREETYPE
-               gui::IGUIElement *e = (gui::IGUIElement *) new gui::intlGUIEditBox(text.c_str(), true, Environment, this, 256, rect);
-               e->drop();
+               if (g_settings->getBool("freetype")) {
+                       e = (gui::IGUIElement *) new gui::intlGUIEditBox(text.c_str(), true, Environment, this, 256, rect);
+                       e->drop();
+               } else {
+                       e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
+               }
                #else
-               gui::IGUIElement *e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
+                       e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
                #endif
                Environment->setFocus(e);
 
@@ -121,14 +128,19 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
                evt.EventType = EET_KEY_INPUT_EVENT;
                evt.KeyInput.Key = KEY_END;
                evt.KeyInput.PressedDown = true;
+               evt.KeyInput.Char = 0;
+               evt.KeyInput.Control = 0;
+               evt.KeyInput.Shift = 0;
                e->OnEvent(evt);
        }
        changeCtype("");
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
+               wchar_t* text = wgettext("Proceed");
                Environment->addButton(rect, this, 257,
-                       wgettext("Proceed"));
+                       text);
+               delete[] text;
        }
        changeCtype("C");
 }