summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-09 01:11:16 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-09 01:11:16 +0300
commit2982a0a5336d6444db3e7b4e054a2104ee76b3a5 (patch)
tree6ec1d474f90717da80b9ed602cf48aacd57bb7e3
parentaf5cdf2f017a012bfc2ea4a5157607f12ce76ce9 (diff)
downloadmv-2982a0a5336d6444db3e7b4e054a2104ee76b3a5.tar.gz
mv-2982a0a5336d6444db3e7b4e054a2104ee76b3a5.tar.bz2
mv-2982a0a5336d6444db3e7b4e054a2104ee76b3a5.tar.xz
mv-2982a0a5336d6444db3e7b4e054a2104ee76b3a5.zip
Replace SDL_IsTextInputActive to lower level SDL function call.
-rw-r--r--src/gui/windowmanager.cpp2
-rw-r--r--src/progs/manaplus/actions/actions.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index ab4224f25..054f19f12 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -473,7 +473,7 @@ void WindowManager::setIcon()
bool WindowManager::isKeyboardVisible()
{
#ifdef USE_SDL2
- return SDL_IsTextInputActive();
+ return SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE;
#else // USE_SDL2
return mKeyboardHeight > 1;
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index b958f8f62..458332fb0 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -970,7 +970,7 @@ impHandler0(showKeyboard)
{
#ifdef ANDROID
#ifdef USE_SDL2
- if (SDL_IsTextInputActive())
+ if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE)
SDL_StopTextInput();
else
SDL_StartTextInput();