summaryrefslogtreecommitdiff
path: root/src/guiTextInputMenu.cpp
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-08-04 20:18:56 +0200
committerPilzAdam <pilzadam@minetest.net>2013-08-04 20:35:14 +0200
commit2af5864534c7615aeaff7e66c4dfb9618809c173 (patch)
tree2b429cd7b78ecb54484b50baf3990c5484b67d91 /src/guiTextInputMenu.cpp
parent3fd84edb615692cc26ea9528fb7b68387f6c471f (diff)
downloadminetest-2af5864534c7615aeaff7e66c4dfb9618809c173.tar.gz
minetest-2af5864534c7615aeaff7e66c4dfb9618809c173.tar.bz2
minetest-2af5864534c7615aeaff7e66c4dfb9618809c173.zip
Make freetype usage configureable by a setting
Diffstat (limited to 'src/guiTextInputMenu.cpp')
-rw-r--r--src/guiTextInputMenu.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index d5229f415..9285aaa81 100644
--- 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);