X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgui%2FguiFormSpecMenu.h;h=d75a108d4a9a36b8a1544055a673dd193a0e5406;hb=f409f4476539f32dcce3ff6832be4bc48bd25634;hp=501b4db1b1da9ed5662865d1b04e7fc4e94797a9;hpb=3b9d49b3c7607cf5f01c7b169f84e312eb0fd99d;p=dragonfireclient.git

diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
index 501b4db1b..d75a108d4 100644
--- a/src/gui/guiFormSpecMenu.h
+++ b/src/gui/guiFormSpecMenu.h
@@ -372,6 +372,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 	{
 			return padding + offset + AbsoluteRect.UpperLeftCorner;
 	}
+	std::wstring getLabelByID(s32 id);
+	std::string getNameByID(s32 id);
 	v2s32 getElementBasePos(bool absolute,
 			const std::vector<std::string> *v_pos);
 
@@ -402,6 +404,7 @@ class GUIFormSpecMenu : public GUIModalMenu
 	std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
 	std::vector<std::pair<FieldSpec,gui::IGUICheckBox*> > m_checkboxes;
 	std::map<std::string, TooltipSpec> m_tooltips;
+	std::vector<std::pair<irr::core::rect<s32>, TooltipSpec>> m_tooltip_rects;
 	std::vector<std::pair<FieldSpec,gui::IGUIScrollBar*> > m_scrollbars;
 	std::vector<std::pair<FieldSpec, std::vector<std::string> > > m_dropdowns;
 
@@ -410,8 +413,6 @@ class GUIFormSpecMenu : public GUIModalMenu
 	bool m_selected_dragging = false;
 	ItemStack m_selected_swap;
 
-	v2s32 m_pointer;
-	v2s32 m_old_pointer;  // Mouse position after previous mouse event
 	gui::IGUIStaticText *m_tooltip_element = nullptr;
 
 	u64 m_tooltip_show_delay;
@@ -534,13 +535,6 @@ class GUIFormSpecMenu : public GUIModalMenu
 	int m_btn_height;
 	gui::IGUIFont *m_font = nullptr;
 
-	std::wstring getLabelByID(s32 id);
-	std::string getNameByID(s32 id);
-#ifdef __ANDROID__
-	v2s32 m_down_pos;
-	std::string m_JavaDialogFieldName;
-#endif
-
 	/* If true, remap a double-click (or double-tap) action to ESC. This is so
 	 * that, for example, Android users can double-tap to close a formspec.
 	*