summaryrefslogtreecommitdiff
path: root/src/guiFormSpecMenu.h
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-04-21 14:10:59 +0200
committersapier <Sapier at GMX dot net>2014-06-29 18:17:56 +0200
commit1cc40c0a7c260f0562572bc99f39a666a12f1b09 (patch)
treec5af6b9787f4c69faa634e82f6484ca4540a7f88 /src/guiFormSpecMenu.h
parentff36071d93266c1dd18708f8924d80aa1af5b33e (diff)
downloadminetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.tar.gz
minetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.tar.bz2
minetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.zip
Add support for Android 2.3+
There have been plenty of ppl involved in creating this version. I don't wanna mention names as I'm sure I'd forget someone so I just tell where help has been done: - The partial android versions done by various ppl - Testing on different android devices - reviewing code (especially the in core changes) - testing controls - reviewing texts A big thank you to everyone helping this to be completed!
Diffstat (limited to 'src/guiFormSpecMenu.h')
-rw-r--r--src/guiFormSpecMenu.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 5d74978a9..72a188bc5 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -151,7 +151,7 @@ class GUIFormSpecMenu : public GUIModalMenu
{
}
FieldSpec(const std::wstring &name, const std::wstring &label,
- const std::wstring &fdeflt, int id) :
+ const std::wstring &fdeflt, int id) :
fname(name),
flabel(label),
fdefault(fdeflt),
@@ -274,6 +274,10 @@ public:
static bool parseColor(const std::string &value,
video::SColor &color, bool quiet);
+#ifdef __ANDROID__
+ bool getAndroidUIInput();
+#endif
+
protected:
v2s32 getBasePos() const
{
@@ -409,6 +413,14 @@ private:
clickpos m_doubleclickdetect[2];
int m_btn_height;
+
+ std::wstring getLabelByID(s32 id);
+ std::wstring getNameByID(s32 id);
+#ifdef __ANDROID__
+ v2s32 m_down_pos;
+ std::wstring m_JavaDialogFieldName;
+#endif
+
};
class FormspecFormSource: public IFormSource