minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Submit name of field on enter key press

Browse Source
This commit is contained in:
rubenwardy 2016-08-07 16:01:00 +01:00
parent fb20b45100
commit 4330c63ea4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/guiFormSpecMenu.cpp
View File

@ -104,6 +104,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
m_formspec_version(0), m_formspec_version(0),
m_focused_element(""), m_focused_element(""),
m_joystick(joystick), m_joystick(joystick),
current_field_enter_pending(""),
m_font(NULL), m_font(NULL),
m_remap_dbl_click(remap_dbl_click) m_remap_dbl_click(remap_dbl_click)
#ifdef __ANDROID__ #ifdef __ANDROID__
@ -2695,6 +2696,10 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no)
current_keys_pending.key_enter = false; current_keys_pending.key_enter = false;
} }
if (!current_field_enter_pending.empty()) {
fields["key_enter_field"] = current_field_enter_pending;
}
if (current_keys_pending.key_escape) { if (current_keys_pending.key_escape) {
fields["key_escape"] = "true"; fields["key_escape"] = "true";
current_keys_pending.key_escape = false; current_keys_pending.key_escape = false;
@ -3625,8 +3630,16 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) { if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
if (event.GUIEvent.Caller->getID() > 257) { if (event.GUIEvent.Caller->getID() > 257) {
for (u32 i = 0; i < m_fields.size(); i++) {
FieldSpec &s = m_fields[i];
if (s.ftype == f_Unknown &&
s.fid == event.GUIEvent.Caller->getID()) {
current_field_enter_pending = s.fname;
}
}
if (m_allowclose) { if (m_allowclose) {
current_keys_pending.key_enter = true;
acceptInput(quit_mode_accept); acceptInput(quit_mode_accept);
quitMenu(); quitMenu();
} else { } else {

2
src/guiFormSpecMenu.h
View File

@ -463,6 +463,7 @@ private:
} fs_key_pendig; } fs_key_pendig;
fs_key_pendig current_keys_pending; fs_key_pendig current_keys_pending;
std::string current_field_enter_pending;
void parseElement(parserData* data,std::string element); void parseElement(parserData* data,std::string element);
@ -557,4 +558,3 @@ public:
}; };
#endif #endif