(Android) Disabled the DisableComposition setting and corresponding menu option

This commit is contained in:
Leon Styhre 2023-12-24 00:37:42 +01:00
parent 5ffd06736a
commit b863861399
3 changed files with 3 additions and 3 deletions

View file

@ -1595,7 +1595,7 @@ void GuiMenu::openOtherOptions()
} }
}); });
#if defined(__unix__) #if defined(__unix__) && !defined(__ANDROID__)
// Whether to disable desktop composition. // Whether to disable desktop composition.
auto disableComposition = std::make_shared<SwitchComponent>(); auto disableComposition = std::make_shared<SwitchComponent>();
disableComposition->setState(Settings::getInstance()->getBool("DisableComposition")); disableComposition->setState(Settings::getInstance()->getBool("DisableComposition"));

View file

@ -292,7 +292,7 @@ void Settings::setDefaults()
mBoolMap["CustomEventScripts"] = {false, false}; mBoolMap["CustomEventScripts"] = {false, false};
mBoolMap["ParseGamelistOnly"] = {false, false}; mBoolMap["ParseGamelistOnly"] = {false, false};
mBoolMap["MAMENameStripExtraInfo"] = {true, true}; mBoolMap["MAMENameStripExtraInfo"] = {true, true};
#if defined(__unix__) #if defined(__unix__) && !defined(__ANDROID__)
mBoolMap["DisableComposition"] = {false, false}; mBoolMap["DisableComposition"] = {false, false};
#endif #endif
mBoolMap["DebugMode"] = {false, false}; mBoolMap["DebugMode"] = {false, false};

View file

@ -172,7 +172,7 @@ bool Renderer::createWindow()
// games or when manually switching windows using the task switcher). // games or when manually switching windows using the task switcher).
SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); 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 // 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 // interface, but with some drivers it can cause strange behaviors when returning to
// the desktop. // the desktop.