Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where fade animations would not finish playing under certain conditions.

Browse source
This commit is contained in:
Leon Styhre 2023-01-08 18:21:37 +01:00
parent 2933c0f9a9
commit 3d5eb2a3cf
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -453,6 +453,11 @@ void ViewController::goToGamelist(SystemData* system)
transitionAnim = static_cast<ViewTransitionAnimation>(
Settings::getInstance()->getInt("TransitionsSystemToGamelist"));
}
else if (mState.viewing == NOTHING) {
transitionType = ViewTransition::STARTUP_TO_GAMELIST;
transitionAnim = static_cast<ViewTransitionAnimation>(
Settings::getInstance()->getInt("TransitionsStartupToGamelist"));
}
else {
transitionType = ViewTransition::GAMELIST_TO_GAMELIST;
transitionAnim = static_cast<ViewTransitionAnimation>(
@ -512,7 +517,8 @@ void ViewController::goToGamelist(SystemData* system)
mSystemListView->finishSystemAnimation(0);
}
if (slideTransitions)
if (slideTransitions ||
(!fadeTransitions && mLastTransitionAnim == ViewTransitionAnimation::FADE))
cancelViewTransitions();
if (mState.viewing == SYSTEM_SELECT) {
@ -565,15 +571,12 @@ void ViewController::goToGamelist(SystemData* system)
if (mState.viewing == NOTHING) {
if (mLastTransitionAnim == ViewTransitionAnimation::FADE)
cancelViewTransitions();
transitionType = ViewTransition::STARTUP_TO_GAMELIST;
mCamera = glm::translate(mCamera, glm::round(-mCurrentView->getPosition()));
if (static_cast<ViewTransitionAnimation>(Settings::getInstance()->getInt(
"TransitionsStartupToGamelist")) == ViewTransitionAnimation::SLIDE) {
if (transitionAnim == ViewTransitionAnimation::SLIDE) {
mCamera[3].y -= Renderer::getScreenHeight();
updateHelpPrompts();
}
else if (static_cast<ViewTransitionAnimation>(Settings::getInstance()->getInt(
"TransitionsStartupToGamelist")) == ViewTransitionAnimation::FADE) {
else if (transitionAnim == ViewTransitionAnimation::FADE) {
mCamera[3].y += Renderer::getScreenHeight() * 2.0f;
}
else {
@ -584,15 +587,17 @@ void ViewController::goToGamelist(SystemData* system)
mState.viewing = GAMELIST;
mState.system = system;
auto it = mGamelistViews.find(system);
if (it != mGamelistViews.cend()) {
std::string viewStyle = it->second->getName();
if (viewStyle == "basic")
mState.viewstyle = BASIC;
else if (viewStyle == "detailed")
mState.viewstyle = DETAILED;
else if (viewStyle == "video")
mState.viewstyle = VIDEO;
if (system->getTheme()->isLegacyTheme()) {
auto it = mGamelistViews.find(system);
if (it != mGamelistViews.cend()) {
std::string viewStyle {it->second->getName()};
if (viewStyle == "basic")
mState.viewstyle = BASIC;
else if (viewStyle == "detailed")
mState.viewstyle = DETAILED;
else if (viewStyle == "video")
mState.viewstyle = VIDEO;
}
}
if (mCurrentView)

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

@ -329,7 +329,6 @@ void Settings::setDefaults()
mBoolMap["DebugText"] = {false, false};
mBoolMap["DebugImage"] = {false, false};
mIntMap["ScraperFilter"] = {0, 0};
mIntMap["TransitionsSystemToSystem"] = {ViewTransitionAnimation::INSTANT,
ViewTransitionAnimation::INSTANT};
mIntMap["TransitionsSystemToGamelist"] = {ViewTransitionAnimation::INSTANT,