From 323c8600450a5ae3893de9ba1d04095589c5b06c Mon Sep 17 00:00:00 2001 From: stujones11 Date: Sun, 24 Jun 2018 20:50:57 +0100 Subject: Move touchscreen input handling to base GUIModalMenu class --- src/gui/guiFormSpecMenu.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/gui/guiFormSpecMenu.h') diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h index 926faa350..d75a108d4 100644 --- a/src/gui/guiFormSpecMenu.h +++ b/src/gui/guiFormSpecMenu.h @@ -372,6 +372,8 @@ protected: { return padding + offset + AbsoluteRect.UpperLeftCorner; } + std::wstring getLabelByID(s32 id); + std::string getNameByID(s32 id); v2s32 getElementBasePos(bool absolute, const std::vector *v_pos); @@ -411,8 +413,6 @@ protected: 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; @@ -535,13 +535,6 @@ private: 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. * -- cgit v1.2.3