Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed an issue where the carousel would not update when entering and exiting gamelist folders.

Browse source
This commit is contained in:
Leon Styhre 2022-09-17 19:27:06 +02:00
parent 30d4c587e7
commit 3636eeba18
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
es-core/src/components/primary/CarouselComponent.h
View file

@ -1123,30 +1123,28 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
if (mScrollVelocity != 0)
mPreviousScrollVelocity = mScrollVelocity;
// No need to animate transition, we're not going anywhere.
if (endPos == mEntryCamOffset)
return;
if (endPos != mEntryCamOffset) {
// Needed to make sure that overlapping items are renderered correctly.
if (startPos > endPos)
mPositiveDirection = true;
else
mPositiveDirection = false;
// Needed to make sure that overlapping items are renderered correctly.
if (startPos > endPos)
mPositiveDirection = true;
else
mPositiveDirection = false;
Animation* anim {new LambdaAnimation(
[this, startPos, endPos, posMax](float t) {
t -= 1;
float f {glm::mix(startPos, endPos, t * t * t + 1)};
if (f < 0)
f += posMax;
if (f >= posMax)
f -= posMax;
Animation* anim {new LambdaAnimation(
[this, startPos, endPos, posMax](float t) {
t -= 1;
float f {glm::mix(startPos, endPos, t * t * t + 1)};
if (f < 0)
f += posMax;
if (f >= posMax)
f -= posMax;
mEntryCamOffset = f;
},
mTransitionsAnimTime)};
mEntryCamOffset = f;
},
mTransitionsAnimTime)};
GuiComponent::setAnimation(anim, 0, nullptr, false, 0);
GuiComponent::setAnimation(anim, 0, nullptr, false, 0);
}
if (mCursorChangedCallback && !mEntries.empty())
mCursorChangedCallback(state);