oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 19:42:10 +00:00
Code Wiki Activity

add "default" field to pwdfield formspec

Browse source
This commit is contained in:
Abdurahman Elmawi 2025-06-28 16:17:26 +03:00
parent fcbf05fc30
commit 825b3011b3
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gui/guiFormSpecMenu.cpp
View file

@ -1441,13 +1441,16 @@ void GUIFormSpecMenu::parseFieldCloseOnEnter(parserData *data, const std::string
void GUIFormSpecMenu::parsePwdField(parserData* data, const std::string &element)
{
std::vector<std::string> parts;
if (!precheckElement("pwdfield", element, 4, 4, parts))
if (!precheckElement("pwdfield", element, 4, 5, parts))
return;
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
std::string label = parts[3];
std::string default_val = "";
if(parts.size() == 5) // If the field has a default value (for backwards compatibility)
default_val = parts[4];
MY_CHECKPOS("pwdfield",0);
MY_CHECKGEOM("pwdfield",1);
@ -1469,6 +1472,9 @@ void GUIFormSpecMenu::parsePwdField(parserData* data, const std::string &element
geom.Y = m_btn_height*2;
}
if(m_form_src)
default_val = m_form_src->resolveText(default_val);
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);
std::wstring wlabel = translate_string(utf8_to_wide(unescape_string(label)));
@ -1483,7 +1489,7 @@ void GUIFormSpecMenu::parsePwdField(parserData* data, const std::string &element
);
spec.send = true;
gui::IGUIEditBox *e = Environment->addEditBox(0, rect, true,
gui::IGUIEditBox *e = Environment->addEditBox(utf8_to_wide(unescape_string(default_val)).c_str(), rect, true,
data->current_parent, spec.fid);
if (spec.fname == m_focused_element) {