diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp index d9b4c13a4..b45a94b2c 100644 --- a/src/config/user_config.hpp +++ b/src/config/user_config.hpp @@ -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 diff --git a/src/guiengine/screen_keyboard.cpp b/src/guiengine/screen_keyboard.cpp index 707d9e2b9..5e39e2c32 100644 --- a/src/guiengine/screen_keyboard.cpp +++ b/src/guiengine/screen_keyboard.cpp @@ -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; } // ----------------------------------------------------------------------------