games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Better android input handling: sending notifications about CInputText changes to java so that we can display textinput overlay there; (#354)

Browse Source
This commit is contained in:
Fay
2017-07-23 19:23:48 +02:00
committed by ArseniyShestakov
parent 069f295165
commit 80f149e296
4 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/widgets/TextControls.cpp
View File

@@ -18,6 +18,10 @@
#include "../../lib/CGeneralTextHandler.h" //for Unicode related stuff
#ifdef VCMI_ANDROID
#include "lib/CAndroidVMHelper.h"
#endif
std::string CLabel::visibleText()
{
return text;
@@ -427,6 +431,9 @@ CTextInput::CTextInput(const Rect &Pos, SDL_Surface *srf)
void CTextInput::focusGot()
{
CSDL_Ext::startTextInput(&pos);
#ifdef VCMI_ANDROID
notifyAndroidTextInputChanged(text);
#endif
}
void CTextInput::focusLost()
@@ -485,6 +492,9 @@ void CTextInput::keyPressed( const SDL_KeyboardEvent & key )
{
redraw();
cb(text);
#ifdef VCMI_ANDROID
notifyAndroidTextInputChanged(text);
#endif
}
}
@@ -493,6 +503,10 @@ void CTextInput::setText( const std::string &nText, bool callCb )
CLabel::setText(nText);
if(callCb)
cb(text);
#ifdef VCMI_ANDROID
notifyAndroidTextInputChanged(text);
#endif
}
bool CTextInput::captureThisEvent(const SDL_KeyboardEvent & key)
@@ -518,6 +532,10 @@ void CTextInput::textInputed(const SDL_TextInputEvent & event)
cb(text);
}
newText = "";
#ifdef VCMI_ANDROID
notifyAndroidTextInputChanged(text);
#endif
}
void CTextInput::textEdited(const SDL_TextEditingEvent & event)
@@ -528,6 +546,11 @@ void CTextInput::textEdited(const SDL_TextEditingEvent & event)
newText = event.text;
redraw();
cb(text+newText);
#ifdef VCMI_ANDROID
auto editedText = text + newText;
notifyAndroidTextInputChanged(editedText);
#endif
}
void CTextInput::filenameFilter(std::string & text, const std::string &)
@@ -574,6 +597,24 @@ void CTextInput::numberFilter(std::string & text, const std::string & oldText, i
}
}
#ifdef VCMI_ANDROID
void CTextInput::notifyAndroidTextInputChanged(std::string & text)
{
if (!focus)
return;
auto fun = [&text](JNIEnv * env, jclass cls, jmethodID method)
{
auto jtext = env->NewStringUTF(text.c_str());
env->CallStaticObjectMethod(cls, method, jtext);
env->DeleteLocalRef(jtext);
};
CAndroidVMHelper vmHelper;
vmHelper.callCustomMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "notifyTextInputChanged",
"(Ljava/lang/String;)V", fun);
}
#endif //VCMI_ANDROID
CFocusable::CFocusable()
{
focus = false;