From 2afa1a789847a0f2f2b284214d1b3195e5229940 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 31 Jan 2024 22:54:04 +0100 Subject: [PATCH] (Android) Disabled the use of SDL_HINT_ENABLE_SCREEN_KEYBOARD from the C++ code as this hint is set via AndroidManifest.xml --- es-app/src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp index 31ed07f1b..4573e9d5f 100644 --- a/es-app/src/main.cpp +++ b/es-app/src/main.cpp @@ -1003,12 +1003,14 @@ int main(int argc, char* argv[]) LOG(LogInfo) << "SDL version: " << std::to_string(version.major) << "." << std::to_string(version.minor) << "." << std::to_string(version.patch); +#if !defined(__ANDROID__) if (version.major > 2 || (version.major == 2 && version.minor >= 28)) { // This will prevent the popup virtual keyboard of any handheld device from being // automatically displayed on top of the ES-DE virtual keyboard. #define SDL_HINT_ENABLE_SCREEN_KEYBOARD "SDL_ENABLE_SCREEN_KEYBOARD" SDL_SetHint(SDL_HINT_ENABLE_SCREEN_KEYBOARD, "0"); } +#endif MameNames::getInstance(); ThemeData::populateThemes();