funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-01-26 17:54:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed incorrect art loading when pressing next/previous letter during highlight animation.

Browse Source
This commit is contained in:
Pieter Hulshoff 2017-04-21 16:54:11 +02:00
parent 23611c88cf
commit 48a7e99784
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RetroFE/Source/RetroFE.cpp
View File

@ -432,9 +432,12 @@ void RetroFE::run()
break;
case RETROFE_HIGHLIGHT_ENTER:
if (currentPage_->isMenuIdle() && processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
RETROFE_STATE state_tmp;
if (currentPage_->isMenuIdle() &&
((state_tmp = processUserInput(currentPage_)) == RETROFE_HIGHLIGHT_REQUEST ||
state_tmp == RETROFE_MENUJUMP_REQUEST) )
{
state = RETROFE_HIGHLIGHT_REQUEST;
state = state_tmp;
}
else if (currentPage_->isIdle())
{
@ -870,6 +873,8 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
!input_.keystate(UserInput::KeyCodeRight) &&
!input_.keystate(UserInput::KeyCodePageUp) &&
!input_.keystate(UserInput::KeyCodePageDown) &&
!input_.keystate(UserInput::KeyCodeLetterUp) &&
!input_.keystate(UserInput::KeyCodeLetterDown) &&
!attract_.isActive())
{
page->resetScrollPeriod();