From 6b23cabe512e5a8facd9ea9d27417e3ff81f38e2 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Fri, 13 Oct 2017 23:05:52 +0200 Subject: [PATCH] Formspec: Fallback to 'label' in readonly textarea[] Guarantees backwards compatibility for this formspec element change --- src/guiFormSpecMenu.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 2abb72578..0482f59a4 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -1119,18 +1119,21 @@ void GUIFormSpecMenu::parseTextArea(parserData* data, std::vector& 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); }