From b8638613990a0d1399450e6ca558d3bf62a07b9b Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 24 Dec 2023 00:37:42 +0100 Subject: [PATCH] (Android) Disabled the DisableComposition setting and corresponding menu option --- es-app/src/guis/GuiMenu.cpp | 2 +- es-core/src/Settings.cpp | 2 +- es-core/src/renderers/Renderer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index a4ced34a3..5bddf78dd 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -1595,7 +1595,7 @@ void GuiMenu::openOtherOptions() } }); -#if defined(__unix__) +#if defined(__unix__) && !defined(__ANDROID__) // Whether to disable desktop composition. auto disableComposition = std::make_shared(); disableComposition->setState(Settings::getInstance()->getBool("DisableComposition")); diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index 081a4b65d..09f415db4 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -292,7 +292,7 @@ void Settings::setDefaults() mBoolMap["CustomEventScripts"] = {false, false}; mBoolMap["ParseGamelistOnly"] = {false, false}; mBoolMap["MAMENameStripExtraInfo"] = {true, true}; -#if defined(__unix__) +#if defined(__unix__) && !defined(__ANDROID__) mBoolMap["DisableComposition"] = {false, false}; #endif mBoolMap["DebugMode"] = {false, false}; diff --git a/es-core/src/renderers/Renderer.cpp b/es-core/src/renderers/Renderer.cpp index c0b3c9bc0..33624d07c 100644 --- a/es-core/src/renderers/Renderer.cpp +++ b/es-core/src/renderers/Renderer.cpp @@ -172,7 +172,7 @@ bool Renderer::createWindow() // games or when manually switching windows using the task switcher). SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); -#if defined(__unix__) +#if defined(__unix__) && !defined(__ANDROID__) // Disabling desktop composition can lead to better framerates and a more fluid user // interface, but with some drivers it can cause strange behaviors when returning to // the desktop.