FormSpec: Add position and anchor elements (#5284)

[oweals/minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index dbcbf126abf7d60c9be0ed352992ca2391901ac4..bbab9c16454b54c1a4b38ceaaa0d8a6f5a11e8ce 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -22,9 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GUIINVENTORYMENU_HEADER
 
 #include <utility>
+#include <stack>
 
 #include "irrlichttypes_extrabloated.h"
-#include "inventory.h"
 #include "inventorymanager.h"
 #include "modalMenu.h"
 #include "guiTable.h"
@@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/enriched_string.h"
 
-class IGameDef;
 class InventoryManager;
 class ISimpleTextureSource;
 class Client;
@@ -211,7 +210,6 @@ class GUIFormSpecMenu : public GUIModalMenu
                        flabel(label),
                        fid(id),
                        send(false),
-                       close_on_enter(false),
                        ftype(f_Unknown),
                        is_exit(false)
                {
@@ -223,7 +221,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;
@@ -290,12 +287,10 @@ public:
                        JoystickController *joystick,
                        gui::IGUIElement* parent, s32 id,
                        IMenuManager *menumgr,
-                       InventoryManager *invmgr,
-                       IGameDef *gamedef,
+                       Client *client,
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       Client* client,
                        bool remap_dbl_click = true);
 
        ~GUIFormSpecMenu();
@@ -380,10 +375,11 @@ protected:
        v2s32 spacing;
        v2s32 imgsize;
        v2s32 offset;
+       v2s32 pos_offset;
+       std::stack<v2s32> container_stack;
 
        irr::IrrlichtDevice* m_device;
        InventoryManager *m_invmgr;
-       IGameDef *m_gamedef;
        ISimpleTextureSource *m_tsrc;
        Client *m_client;
 
@@ -397,6 +393,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;
@@ -406,8 +403,6 @@ protected:
        std::vector<std::pair<FieldSpec, std::vector<std::string> > > m_dropdowns;
 
        ItemSpec *m_selected_item;
-       f32 m_timer1;
-       f32 m_timer2;
        u32 m_selected_amount;
        bool m_selected_dragging;
 
@@ -452,6 +447,8 @@ private:
                bool explicit_size;
                v2f invsize;
                v2s32 size;
+               v2f32 offset;
+               v2f32 anchor;
                core::rect<s32> rect;
                v2s32 basepos;
                v2u32 screensize;
@@ -459,7 +456,7 @@ private:
                GUITable::TableOptions table_options;
                GUITable::TableColumns table_columns;
                // used to restore table selection/scroll/treeview state
-               std::map<std::string, GUITable::DynamicData> table_dyndata;
+               UNORDERED_MAP<std::string, GUITable::DynamicData> table_dyndata;
        } parserData;
 
        typedef struct {
@@ -472,13 +469,15 @@ private:
        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);
 
-       void parseSize(parserData* data,std::string element);
-       void parseList(parserData* data,std::string element);
-       void parseListRing(parserData* data,std::string element);
-       void parseCheckbox(parserData* data,std::string element);
-       void parseImage(parserData* data,std::string element);
+       void parseSize(parserData* data, std::string element);
+       void parseContainer(parserData* data, std::string element);
+       void parseContainerEnd(parserData* data);
+       void parseList(parserData* data, std::string element);
+       void parseListRing(parserData* data, std::string element);
+       void parseCheckbox(parserData* data, std::string element);
+       void parseImage(parserData* data, std::string element);
        void parseItemImage(parserData* data,std::string element);
        void parseButton(parserData* data,std::string element,std::string typ);
        void parseBackground(parserData* data,std::string element);
@@ -487,6 +486,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);
@@ -504,6 +504,10 @@ private:
        bool parseVersionDirect(std::string data);
        bool parseSizeDirect(parserData* data, std::string element);
        void parseScrollBar(parserData* data, std::string element);
+       bool parsePositionDirect(parserData *data, const std::string &element);
+       void parsePosition(parserData *data, const std::string &element);
+       bool parseAnchorDirect(parserData *data, const std::string &element);
+       void parseAnchor(parserData *data, const std::string &element);
 
        void tryClose();