Skip to content
Permalink
Browse files

Formspec: Fallback to 'label' in readonly textarea[]

Guarantees backwards compatibility for this formspec element change
  • Loading branch information...
SmallJoker committed Oct 13, 2017
1 parent 9a41a3d commit 6b23cabe512e5a8facd9ea9d27417e3ff81f38e2
Showing with 7 additions and 4 deletions.
  1. +7 −4 src/guiFormSpecMenu.cpp
@@ -1119,18 +1119,21 @@ void GUIFormSpecMenu::parseTextArea(parserData* data, std::vector<std::string>&

if (is_editable)
spec.send = true;

gui::IGUIEditBox *e;

gui::IGUIEditBox *e = nullptr;
const wchar_t *text = spec.fdefault.empty() ?
wlabel.c_str() : spec.fdefault.c_str();

#if USE_FREETYPE && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9
if (g_settings->getBool("freetype")) {
e = (gui::IGUIEditBox *) new gui::intlGUIEditBox(spec.fdefault.c_str(),
e = (gui::IGUIEditBox *) new gui::intlGUIEditBox(text,
true, Environment, this, spec.fid, rect, is_editable, true);
e->drop();
} else {
#else
{
#endif
e = new GUIEditBoxWithScrollBar(spec.fdefault.c_str(), true,
e = new GUIEditBoxWithScrollBar(text, true,
Environment, this, spec.fid, rect, is_editable, true);
}

0 comments on commit 6b23cab

Please sign in to comment.
You can’t perform that action at this time.