Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled the option on all operating systems to run ES-DE in the background while a game is launched.

Browse source
This commit is contained in:
Leon Styhre 2021-06-30 17:19:57 +02:00
parent bed6b24eeb
commit 1478bbf550
3 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/guis/GuiMenu.cpp
View file

@ -1033,6 +1033,7 @@ void GuiMenu::openOtherOptions()
s->setNeedsSaving();
}
});
#endif
// Run ES in the background when a game has been launched.
auto run_in_background = std::make_shared<SwitchComponent>(mWindow);
@ -1044,7 +1045,6 @@ void GuiMenu::openOtherOptions()
s->setNeedsSaving();
}
});
#endif
// Whether to upscale the video frame rate to 60 FPS.
auto video_upscale_frame_rate = std::make_shared<SwitchComponent>(mWindow);

28
es-app/src/views/ViewController.cpp
View file

@ -607,18 +607,14 @@ void ViewController::onFileChanged(FileData* file, bool reloadGameList)
bool ViewController::runInBackground(SystemData* system)
{
#if defined(_WIN64)
// Running in the background is required for Steam games as Steam itself may start together
// with the game. In that situation ES-DE would wait until the whole Steam application was
// shut down before it would resume. I.e. it would not be enough to just stop the game.
if (system->hasPlatformId(PlatformIds::VALVE_STEAM) ||
Settings::getInstance()->getBool("RunInBackground"))
return true;
else
return false;
#else
if (system->hasPlatformId(PlatformIds::VALVE_STEAM))
return true;
else
return false;
#endif
}
void ViewController::launch(FileData* game)
@ -788,11 +784,11 @@ bool ViewController::input(InputConfig* config, Input input)
if (mLockInput)
return true;
// For Steam games or if enabling the "RunInBackground" setting on Windows, ES-DE will
// run in the background while a game is launched. If we're in this state and then
// register some input, it means that the user is back in ES-DE. Therefore unset the game
// launch flag and update all the GUI components. This will re-enable the video player
// and let the screensaver start on schedule again.
// For Steam games or if enabling the "RunInBackground" setting, ES-DE will run in the
// background while a game is launched. If we're in this state and then register some
// input, it means that the user is back in ES-DE. Therefore unset the game launch flag
// and update all the GUI components. This will re-enable the video player and let the
// screensaver start on schedule again.
if (mWindow->getGameLaunchedState())
mWindow->unsetLaunchedGame();
@ -954,10 +950,10 @@ void ViewController::reloadGameListView(IGameListView* view, bool reloadTheme)
}
}
// For Steam games or if enabling the "RunInBackground" setting on Windows, ES-DE will
// run in the background while a game is launched. If this flag has been set, then update
// all the GUI components. This will disable the video player and prevent the screensaver
// from starting on schedule.
// For Steam games or if enabling the "RunInBackground" setting, ES-DE will run in the
// background while a game is launched. If this flag has been set, then update all the
// GUI components. This will disable the video player and prevent the screensaver from
// starting on schedule.
if (mWindow->getGameLaunchedState())
mWindow->setLaunchedGame();

5
es-core/src/Settings.cpp
View file

@ -244,11 +244,8 @@ void Settings::setDefaults()
mStringMap["SaveGamelistsMode"] = { "always", "always" };
#if defined(_WIN64)
mBoolMap["HideTaskbar"] = { false, false };
// This setting may cause problems on some Windows versions, but it seems as if Windows 10
// handles the suspension of ES correctly. As there are some adverse affects from running ES
// in the background while a game is running, by default this is set to false.
mBoolMap["RunInBackground"] = { false, false };
#endif
mBoolMap["RunInBackground"] = { false, false };
mStringMap["MediaDirectory"] = { "", "" };
mBoolMap["VideoUpscaleFrameRate"] = { false, false };
mBoolMap["LaunchCommandOverride"] = { true, true };