Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index d70c3a5827be6ca1cd9f537da2d07a00cdc7cc27..9eaf60ac6353794563390a08408e46527367054c 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -57,7 +57,7 @@ struct TextDest
 {
        virtual ~TextDest() {}
        // This is deprecated I guess? -celeron55
-       virtual void gotText(std::wstring text){}
+       virtual void gotText(const std::wstring &text) {}
        virtual void gotText(const StringMap &fields) = 0;
 
        std::string m_formname;
@@ -69,7 +69,7 @@ public:
        virtual ~IFormSource(){}
        virtual std::string getForm() = 0;
        // Fill in variables in field text
-       virtual std::string resolveText(std::string str){ return str; }
+       virtual std::string resolveText(const std::string &str) { return str; }
 };
 
 class GUIFormSpecMenu : public GUIModalMenu
@@ -420,8 +420,8 @@ protected:
        v2s32 m_old_pointer;  // Mouse position after previous mouse event
        gui::IGUIStaticText *m_tooltip_element;
 
-       u32 m_tooltip_show_delay;
-       s32 m_hovered_time;
+       u64 m_tooltip_show_delay;
+       u64 m_hovered_time;
        s32 m_old_tooltip_id;
        std::wstring m_old_tooltip;
 
@@ -517,6 +517,9 @@ private:
 
        void tryClose();
 
+       void showTooltip(const std::wstring &text, const irr::video::SColor &color,
+               const irr::video::SColor &bgcolor);
+
        /**
         * check if event is part of a double click
         * @param event event to evaluate
@@ -527,7 +530,7 @@ private:
        struct clickpos
        {
                v2s32 pos;
-               s32 time;
+               s64 time;
        };
        clickpos m_doubleclickdetect[2];