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

Fixed attractMode timer when using a controller.

Browse Source
This commit is contained in:
Pieter Hulshoff 2017-04-19 20:56:53 +02:00
parent 8854a9a67b
commit 23611c88cf
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
RetroFE/Source/RetroFE.cpp
View File

@ -696,7 +696,6 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
input_.update(e); input_.update(e);
if(e.type == SDL_KEYDOWN && !e.key.repeat) if(e.type == SDL_KEYDOWN && !e.key.repeat)
{ {
attract_.reset();
break; break;
} }
} }
@ -705,12 +704,14 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
{ {
if (input_.keystate(UserInput::KeyCodeLeft)) if (input_.keystate(UserInput::KeyCodeLeft))
{ {
attract_.reset();
page->setScrolling(Page::ScrollDirectionBack); page->setScrolling(Page::ScrollDirectionBack);
page->scroll(false); page->scroll(false);
page->updateScrollPeriod(); page->updateScrollPeriod();
} }
if (input_.keystate(UserInput::KeyCodeRight)) if (input_.keystate(UserInput::KeyCodeRight))
{ {
attract_.reset();
page->setScrolling(Page::ScrollDirectionForward); page->setScrolling(Page::ScrollDirectionForward);
page->scroll(true); page->scroll(true);
page->updateScrollPeriod(); page->updateScrollPeriod();
@ -720,12 +721,14 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
{ {
if (input_.keystate(UserInput::KeyCodeUp)) if (input_.keystate(UserInput::KeyCodeUp))
{ {
attract_.reset();
page->setScrolling(Page::ScrollDirectionBack); page->setScrolling(Page::ScrollDirectionBack);
page->scroll(false); page->scroll(false);
page->updateScrollPeriod(); page->updateScrollPeriod();
} }
if (input_.keystate(UserInput::KeyCodeDown)) if (input_.keystate(UserInput::KeyCodeDown))
{ {
attract_.reset();
page->setScrolling(Page::ScrollDirectionForward); page->setScrolling(Page::ScrollDirectionForward);
page->scroll(true); page->scroll(true);
page->updateScrollPeriod(); page->updateScrollPeriod();
@ -758,55 +761,65 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
if (input_.keystate(UserInput::KeyCodePageUp)) if (input_.keystate(UserInput::KeyCodePageUp))
{ {
attract_.reset();
page->pageScroll(Page::ScrollDirectionBack); page->pageScroll(Page::ScrollDirectionBack);
page->reallocateMenuSpritePoints(); page->reallocateMenuSpritePoints();
state = RETROFE_MENUJUMP_REQUEST; state = RETROFE_MENUJUMP_REQUEST;
} }
if (input_.keystate(UserInput::KeyCodePageDown)) if (input_.keystate(UserInput::KeyCodePageDown))
{ {
attract_.reset();
page->pageScroll(Page::ScrollDirectionForward); page->pageScroll(Page::ScrollDirectionForward);
page->reallocateMenuSpritePoints(); page->reallocateMenuSpritePoints();
state = RETROFE_MENUJUMP_REQUEST; state = RETROFE_MENUJUMP_REQUEST;
} }
if (input_.keystate(UserInput::KeyCodeLetterUp)) if (input_.keystate(UserInput::KeyCodeLetterUp))
{ {
attract_.reset();
page->letterScroll(Page::ScrollDirectionBack); page->letterScroll(Page::ScrollDirectionBack);
page->reallocateMenuSpritePoints(); page->reallocateMenuSpritePoints();
state = RETROFE_MENUJUMP_REQUEST; state = RETROFE_MENUJUMP_REQUEST;
} }
if (input_.keystate(UserInput::KeyCodeLetterDown)) if (input_.keystate(UserInput::KeyCodeLetterDown))
{ {
attract_.reset();
page->letterScroll(Page::ScrollDirectionForward); page->letterScroll(Page::ScrollDirectionForward);
page->reallocateMenuSpritePoints(); page->reallocateMenuSpritePoints();
state = RETROFE_MENUJUMP_REQUEST; state = RETROFE_MENUJUMP_REQUEST;
} }
if(input_.newKeyPressed(UserInput::KeyCodeFavPlaylist)) if(input_.newKeyPressed(UserInput::KeyCodeFavPlaylist))
{ {
attract_.reset();
page->favPlaylist(); page->favPlaylist();
state = RETROFE_PLAYLIST_REQUEST; state = RETROFE_PLAYLIST_REQUEST;
} }
if(input_.newKeyPressed(UserInput::KeyCodeNextPlaylist)) if(input_.newKeyPressed(UserInput::KeyCodeNextPlaylist))
{ {
attract_.reset();
page->nextPlaylist(); page->nextPlaylist();
state = RETROFE_PLAYLIST_REQUEST; state = RETROFE_PLAYLIST_REQUEST;
} }
if(input_.newKeyPressed(UserInput::KeyCodePrevPlaylist)) if(input_.newKeyPressed(UserInput::KeyCodePrevPlaylist))
{ {
attract_.reset();
page->prevPlaylist(); page->prevPlaylist();
state = RETROFE_PLAYLIST_REQUEST; state = RETROFE_PLAYLIST_REQUEST;
} }
if(input_.newKeyPressed(UserInput::KeyCodeRemovePlaylist)) if(input_.newKeyPressed(UserInput::KeyCodeRemovePlaylist))
{ {
attract_.reset();
page->removePlaylist(); page->removePlaylist();
state = RETROFE_PLAYLIST_REQUEST; state = RETROFE_PLAYLIST_REQUEST;
} }
if(input_.newKeyPressed(UserInput::KeyCodeAddPlaylist)) if(input_.newKeyPressed(UserInput::KeyCodeAddPlaylist))
{ {
attract_.reset();
page->addPlaylist(); page->addPlaylist();
state = RETROFE_PLAYLIST_REQUEST; state = RETROFE_PLAYLIST_REQUEST;
} }
if(input_.keystate(UserInput::KeyCodeRandom)) if(input_.keystate(UserInput::KeyCodeRandom))
{ {
attract_.reset();
page->selectRandom(); page->selectRandom();
page->reallocateMenuSpritePoints(); page->reallocateMenuSpritePoints();
state = RETROFE_HIGHLIGHT_REQUEST; state = RETROFE_HIGHLIGHT_REQUEST;
@ -819,6 +832,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
} }
if (input_.keystate(UserInput::KeyCodeSelect)) if (input_.keystate(UserInput::KeyCodeSelect))
{ {
attract_.reset();
nextPageItem_ = page->getSelectedItem(); nextPageItem_ = page->getSelectedItem();
if(nextPageItem_) if(nextPageItem_)
@ -836,6 +850,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
if (input_.keystate(UserInput::KeyCodeBack)) if (input_.keystate(UserInput::KeyCodeBack))
{ {
attract_.reset();
if(back(exit) || exit) if(back(exit) || exit)
{ {
state = (exit) ? RETROFE_QUIT_REQUEST : RETROFE_BACK_REQUEST; state = (exit) ? RETROFE_QUIT_REQUEST : RETROFE_BACK_REQUEST;
@ -844,6 +859,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
if (input_.keystate(UserInput::KeyCodeQuit)) if (input_.keystate(UserInput::KeyCodeQuit))
{ {
attract_.reset();
state = RETROFE_QUIT_REQUEST; state = RETROFE_QUIT_REQUEST;
} }
} }
@ -859,6 +875,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
page->resetScrollPeriod(); page->resetScrollPeriod();
if (page->isMenuScrolling()) if (page->isMenuScrolling())
{ {
attract_.reset();
state = RETROFE_HIGHLIGHT_REQUEST; state = RETROFE_HIGHLIGHT_REQUEST;
} }
} }