diff options
| author | rubenwardy <rubenwardy@gmail.com> | 2016-10-03 00:30:33 +0100 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 18:58:28 +0200 |
| commit | 067766eec213918b6cb5b2533d0c78eceb3949ec (patch) | |
| tree | 3db9f36c4e6b2fa37624507e89141f361ee7a78f /src/guiFormSpecMenu.h | |
| parent | 0baea8c25cb04bcbeca5ae532a00d877628f6b06 (diff) | |
| download | minetest-067766eec213918b6cb5b2533d0c78eceb3949ec.tar.gz minetest-067766eec213918b6cb5b2533d0c78eceb3949ec.tar.bz2 minetest-067766eec213918b6cb5b2533d0c78eceb3949ec.zip | |
Fix backwards compatibility issue introduced by close_on_enter
Diffstat (limited to 'src/guiFormSpecMenu.h')
| -rw-r--r-- | src/guiFormSpecMenu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 153720975..95df11e6a 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -212,7 +212,6 @@ class GUIFormSpecMenu : public GUIModalMenu flabel(label), fid(id), send(false), - close_on_enter(false), ftype(f_Unknown), is_exit(false) { @@ -224,7 +223,6 @@ class GUIFormSpecMenu : public GUIModalMenu std::wstring fdefault; int fid; bool send; - bool close_on_enter; // used by text fields FormspecFieldType ftype; bool is_exit; core::rect<s32> rect; @@ -400,6 +398,7 @@ protected: std::vector<ImageDrawSpec> m_images; std::vector<ImageDrawSpec> m_itemimages; std::vector<BoxDrawSpec> m_boxes; + UNORDERED_MAP<std::string, bool> field_close_on_enter; std::vector<FieldSpec> m_fields; std::vector<StaticTextSpec> m_static_texts; std::vector<std::pair<FieldSpec,GUITable*> > m_tables; @@ -490,6 +489,7 @@ private: void parseTable(parserData* data,std::string element); void parseTextList(parserData* data,std::string element); void parseDropDown(parserData* data,std::string element); + void parseFieldCloseOnEnter(parserData *data, const std::string &element); void parsePwdField(parserData* data,std::string element); void parseField(parserData* data,std::string element,std::string type); void parseSimpleField(parserData* data,std::vector<std::string> &parts); |