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

Allow to use screen keyboard even if hardware keyboard is available

Browse Source
This commit is contained in:
Deve
2018-07-11 21:01:56 +02:00
parent b537df54fc
commit e0d262bfdd
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/config/user_config.hpp
View File

@@ -466,10 +466,11 @@ namespace UserConfigParams
"A parameter in range [0.5, 1.5] that determines the scale of the "
"multitouch interface."));
PARAM_PREFIX BoolUserConfigParam m_screen_keyboard
PARAM_DEFAULT( BoolUserConfigParam(false, "screen_keyboard",
PARAM_PREFIX IntUserConfigParam m_screen_keyboard
PARAM_DEFAULT( IntUserConfigParam(0, "screen_keyboard_mode",
&m_multitouch_group,
"Enable screen keyboard.") );
"Screen keyboard mode: 0 = disabled, 1 = enabled if no hardware "
"keyboard, 2 = always enabled") );
PARAM_PREFIX BoolUserConfigParam m_hidpi_enabled
PARAM_DEFAULT( BoolUserConfigParam(false, "hidpi_enabled",

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

@@ -1262,15 +1262,15 @@ bool CGUIEditBox::processMouse(const SEvent& event)
}
else if (!m_rtl)
{
bool use_screen_keyboard = UserConfigParams::m_screen_keyboard;
bool use_screen_keyboard = UserConfigParams::m_screen_keyboard > 1;
#ifdef ANDROID
int32_t keyboard = AConfiguration_getKeyboard(
global_android_app->config);
if (keyboard == ACONFIGURATION_KEYBOARD_QWERTY)
if (UserConfigParams::m_screen_keyboard == 1)
{
use_screen_keyboard = false;
int32_t keyboard = AConfiguration_getKeyboard(
global_android_app->config);
use_screen_keyboard = (keyboard != ACONFIGURATION_KEYBOARD_QWERTY);
}
#endif

2
src/main_android.cpp
View File

@@ -46,7 +46,7 @@ void override_default_params()
if (touch != ACONFIGURATION_TOUCHSCREEN_NOTOUCH)
{
UserConfigParams::m_multitouch_enabled = true;
UserConfigParams::m_screen_keyboard = true;
UserConfigParams::m_screen_keyboard = 1;
}
// Set bigger fonts and buttons