diff options
| author | sfan5 <sfan5@live.de> | 2021-03-19 18:44:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 18:44:32 +0100 |
| commit | 96d4df995c1baf364217699cd43e5ab71918c9d8 (patch) | |
| tree | 531fef95d5886805191e74d0a1bf418e146e1f61 /src/gui/guiFormSpecMenu.cpp | |
| parent | 285ba74723695c4b51192dac0e1e17c5d8f880db (diff) | |
| download | minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.tar.gz minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.tar.bz2 minetest-96d4df995c1baf364217699cd43e5ab71918c9d8.zip | |
Drop old text input workarounds (#11089)
* Drop unused intlGUIEditBox
* Drop unnecessary Linux text input workarounds
Diffstat (limited to 'src/gui/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index 5d763a4be..4661e505d 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -65,7 +65,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiInventoryList.h" #include "guiItemImage.h" #include "guiScrollContainer.h" -#include "intlGUIEditBox.h" #include "guiHyperText.h" #include "guiScene.h" @@ -1547,21 +1546,13 @@ void GUIFormSpecMenu::createTextField(parserData *data, FieldSpec &spec, } gui::IGUIEditBox *e = nullptr; - static constexpr bool use_intl_edit_box = USE_FREETYPE && - IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9; - - if (use_intl_edit_box && g_settings->getBool("freetype")) { - e = new gui::intlGUIEditBox(spec.fdefault.c_str(), true, Environment, - data->current_parent, spec.fid, rect, is_editable, is_multiline); - } else { - if (is_multiline) { - e = new GUIEditBoxWithScrollBar(spec.fdefault.c_str(), true, Environment, - data->current_parent, spec.fid, rect, is_editable, true); - } else if (is_editable) { - e = Environment->addEditBox(spec.fdefault.c_str(), rect, true, - data->current_parent, spec.fid); - e->grab(); - } + if (is_multiline) { + e = new GUIEditBoxWithScrollBar(spec.fdefault.c_str(), true, Environment, + data->current_parent, spec.fid, rect, is_editable, true); + } else if (is_editable) { + e = Environment->addEditBox(spec.fdefault.c_str(), rect, true, + data->current_parent, spec.fid); + e->grab(); } auto style = getDefaultStyleForElement(is_multiline ? "textarea" : "field", spec.fname); |