ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only do android callback for soft keyboard

Browse Source
This commit is contained in:
Benau 2019-05-28 01:55:10 +08:00
parent 6216d003b6
commit 1d3dfc3110
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/guiengine/screen_keyboard.cpp
View File

@ -27,10 +27,6 @@
#include "states_screens/state_manager.hpp"
#include "utils/log.hpp"
#ifdef ANDROID
#include "../../../lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h"
#endif
#include <algorithm>
#include <string>

9
src/guiengine/widgets/CGUIEditBox.cpp
View File

@ -297,7 +297,8 @@ bool CGUIEditBox::OnEvent(const SEvent& event)
}
#endif
#ifdef ANDROID
if (irr_driver->getDevice()->hasOnScreenKeyboard() &&
if (GUIEngine::ScreenKeyboard::shouldUseScreenKeyboard() &&
irr_driver->getDevice()->hasOnScreenKeyboard() &&
irr_driver->getDevice()->getType() == irr::EIDT_ANDROID)
{
// If user toggle with hacker keyboard with arrows, keep
@ -1189,7 +1190,8 @@ void CGUIEditBox::setText(const wchar_t* text)
HScrollPos = 0;
breakText();
#ifdef ANDROID
if (irr_driver->getDevice()->hasOnScreenKeyboard() &&
if (GUIEngine::ScreenKeyboard::shouldUseScreenKeyboard() &&
irr_driver->getDevice()->hasOnScreenKeyboard() &&
irr_driver->getDevice()->getType() == irr::EIDT_ANDROID)
{
CIrrDeviceAndroid* dl = dynamic_cast<CIrrDeviceAndroid*>(
@ -1730,7 +1732,8 @@ void CGUIEditBox::setTextMarkers(s32 begin, s32 end)
MarkEnd = end;
sendGuiEvent(EGET_EDITBOX_MARKING_CHANGED);
#ifdef ANDROID
if (irr_driver->getDevice()->hasOnScreenKeyboard() &&
if (GUIEngine::ScreenKeyboard::shouldUseScreenKeyboard() &&
irr_driver->getDevice()->hasOnScreenKeyboard() &&
irr_driver->getDevice()->getType() == irr::EIDT_ANDROID)
{
CIrrDeviceAndroid* dl = dynamic_cast<CIrrDeviceAndroid*>(