funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 09:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scrollingPeriod_ in case of incorrect initialisation or update.

Browse Source
This commit is contained in:
Pieter Hulshoff 2017-01-04 20:52:37 +01:00
parent cbcfc498a3
commit 2b2b6bc7ce
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RetroFE/Source/Graphics/Component/ScrollingList.cpp
View File

@ -78,7 +78,7 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
, selectedOffsetIndex_(copy.selectedOffsetIndex_) , selectedOffsetIndex_(copy.selectedOffsetIndex_)
, scrollAcceleration_(copy.scrollAcceleration_) , scrollAcceleration_(copy.scrollAcceleration_)
, startScrollTime_(copy.startScrollTime_) , startScrollTime_(copy.startScrollTime_)
, scrollPeriod_(0) , scrollPeriod_(copy.startScrollTime_)
, config_(copy.config_) , config_(copy.config_)
, scaleX_(copy.scaleX_) , scaleX_(copy.scaleX_)
, scaleY_(copy.scaleY_) , scaleY_(copy.scaleY_)
@ -367,6 +367,14 @@ void ScrollingList::triggerHighlightExitEvent( int menuIndex )
void ScrollingList::update(float dt) void ScrollingList::update(float dt)
{ {
// Check if scrollPeriod_ has been properly initialised already or if something went wrong
// while updating the scrollPeriod_
if(scrollPeriod_ < scrollAcceleration_)
{
scrollPeriod_ = startScrollTime_;
}
Component::update(dt); Component::update(dt);
if(components_.size() == 0) return; if(components_.size() == 0) return;

1
RetroFE/Source/RetroFE.cpp
View File

@ -313,7 +313,6 @@ void RetroFE::run()
case RETROFE_ENTER: case RETROFE_ENTER:
if(currentPage_->isIdle()) if(currentPage_->isIdle())
{ {
currentPage_->resetScrollPeriod();
state = RETROFE_IDLE; state = RETROFE_IDLE;
} }
break; break;