Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where overlapping carousel items were not rendered correctly during transitions.

Browse source
This commit is contained in:
Leon Styhre 2022-09-17 12:17:01 +02:00
parent 3789a0ca12
commit 87749e7d37
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@ private:
float mEntryCamOffset;
int mPreviousScrollVelocity;
bool mPositiveDirection;
bool mTriggerJump;
bool mGamelistView;
bool mUppercase;
@ -157,6 +158,7 @@ CarouselComponent<T>::CarouselComponent()
, mRenderer {Renderer::getInstance()}
, mEntryCamOffset {0.0f}
, mPreviousScrollVelocity {0}
, mPositiveDirection {false}
, mTriggerJump {false}
, mGamelistView {std::is_same_v<T, FileData*> ? true : false}
, mUppercase {false}
@ -621,7 +623,13 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
yOff += mSize.y * mVerticalOffset;
}
int center {static_cast<int>(mEntryCamOffset)};
int center {0};
// Needed to make sure that overlapping items are renderered correctly.
if (mPositiveDirection)
center = static_cast<int>(std::floor(mEntryCamOffset));
else
center = static_cast<int>(std::ceil(mEntryCamOffset));
int itemInclusion {static_cast<int>(std::ceil(mMaxItemCount / 2.0f))};
bool singleEntry {numEntries == 1};
@ -1099,6 +1107,12 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
if (endPos == mEntryCamOffset)
return;
// 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;