Update default value of screen keyboard status after SDL2 is used

This commit is contained in:
Benau 2020-07-15 00:21:38 +08:00
parent 1cc47fae5c
commit fe8a6fb6a9
2 changed files with 3 additions and 10 deletions

View File

@ -563,10 +563,9 @@ namespace UserConfigParams
"multitouch interface."));
PARAM_PREFIX IntUserConfigParam m_screen_keyboard
PARAM_DEFAULT( IntUserConfigParam(1, "screen_keyboard_mode",
PARAM_DEFAULT( IntUserConfigParam(0, "screen_keyboard_status",
&m_multitouch_group,
"Screen keyboard mode: 0 = disabled, 1 = enabled if no hardware "
"keyboard, 2 = always enabled") );
"STK screen keyboard status: 0 = disabled, 1 = enabled") );
// ---- GP start order
PARAM_PREFIX GroupUserConfigParam m_gp_start_order

View File

@ -531,13 +531,7 @@ bool ScreenKeyboard::onEscapePressed()
*/
bool ScreenKeyboard::shouldUseScreenKeyboard()
{
bool always_use_screen_keyboard =
UserConfigParams::m_screen_keyboard == 2;
if (UserConfigParams::m_screen_keyboard == 1)
return true;
return always_use_screen_keyboard;
return UserConfigParams::m_screen_keyboard == 1;
}
// ----------------------------------------------------------------------------