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

Fixed an issue where ScrollableContainer would not scroll at the correct speed.

Browse source
This commit is contained in:
Leon Styhre 2022-09-24 22:53:52 +02:00
parent 9d0b3b911f
commit 664a39df2c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
es-core/src/components/ScrollableContainer.cpp
View file

@ -132,7 +132,7 @@ void ScrollableContainer::update(int deltaTime)
// Don't scroll if the media viewer or screensaver is active or if text scrolling is disabled; // Don't scroll if the media viewer or screensaver is active or if text scrolling is disabled;
if (mWindow->isMediaViewerActive() || mWindow->isScreensaverActive() || if (mWindow->isMediaViewerActive() || mWindow->isScreensaverActive() ||
!mWindow->getAllowTextScrolling()) { !mWindow->getAllowTextScrolling()) {
if (mScrollPos != glm::vec2 {} && !mWindow->isLaunchScreenDisplayed()) if (mScrollPos != glm::vec2 {0.0f, 0.0f} && !mWindow->isLaunchScreenDisplayed())
reset(); reset();
return; return;
} }
@ -149,6 +149,11 @@ void ScrollableContainer::update(int deltaTime)
mAdjustedAutoScrollSpeed = static_cast<int>(speedModifier); mAdjustedAutoScrollSpeed = static_cast<int>(speedModifier);
} }
// If there are less than 8 lines of text, accelerate the scrolling further.
const float lines {mAdjustedHeight / combinedHeight};
if (lines < 8.0f)
rowModifier = lines / 8.0f;
if (mAdjustedAutoScrollSpeed < 0) if (mAdjustedAutoScrollSpeed < 0)
mAdjustedAutoScrollSpeed = 1; mAdjustedAutoScrollSpeed = 1;