diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp index 4a3f8a4..87b58fd 100644 --- a/RetroFE/Source/RetroFE.cpp +++ b/RetroFE/Source/RetroFE.cpp @@ -394,6 +394,24 @@ void RetroFE::run() } break; + case RETROFE_MENUJUMP_REQUEST: + currentPage_->setScrolling(Page::ScrollDirectionIdle); + currentPage_->highlightExit(); + state = RETROFE_MENUJUMP_EXIT; + break; + + case RETROFE_MENUJUMP_EXIT: + if (currentPage_->isMenuIdle() && processUserInput(currentPage_) == RETROFE_MENUJUMP_REQUEST) + { + state = RETROFE_MENUJUMP_REQUEST; + } + if (currentPage_->isIdle()) + { + currentPage_->highlightLoadArt(); + state = RETROFE_HIGHLIGHT_LOAD_ART; + } + break; + case RETROFE_HIGHLIGHT_REQUEST: currentPage_->setScrolling(Page::ScrollDirectionIdle); currentPage_->highlightExit(); @@ -742,25 +760,25 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page) { page->pageScroll(Page::ScrollDirectionBack); page->reallocateMenuSpritePoints(); - state = RETROFE_HIGHLIGHT_REQUEST; + state = RETROFE_MENUJUMP_REQUEST; } if (input_.keystate(UserInput::KeyCodePageDown)) { page->pageScroll(Page::ScrollDirectionForward); page->reallocateMenuSpritePoints(); - state = RETROFE_HIGHLIGHT_REQUEST; + state = RETROFE_MENUJUMP_REQUEST; } if (input_.keystate(UserInput::KeyCodeLetterUp)) { page->letterScroll(Page::ScrollDirectionBack); page->reallocateMenuSpritePoints(); - state = RETROFE_HIGHLIGHT_REQUEST; + state = RETROFE_MENUJUMP_REQUEST; } if (input_.keystate(UserInput::KeyCodeLetterDown)) { page->letterScroll(Page::ScrollDirectionForward); page->reallocateMenuSpritePoints(); - state = RETROFE_HIGHLIGHT_REQUEST; + state = RETROFE_MENUJUMP_REQUEST; } if(input_.newKeyPressed(UserInput::KeyCodeFavPlaylist)) { diff --git a/RetroFE/Source/RetroFE.h b/RetroFE/Source/RetroFE.h index 69db468..b99419a 100644 --- a/RetroFE/Source/RetroFE.h +++ b/RetroFE/Source/RetroFE.h @@ -59,6 +59,8 @@ private: RETROFE_PLAYLIST_EXIT, RETROFE_PLAYLIST_LOAD_ART, RETROFE_PLAYLIST_ENTER, + RETROFE_MENUJUMP_REQUEST, + RETROFE_MENUJUMP_EXIT, RETROFE_HIGHLIGHT_REQUEST, RETROFE_HIGHLIGHT_EXIT, RETROFE_HIGHLIGHT_LOAD_ART, diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index 46eab4d..4115516 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -19,8 +19,8 @@ std::string retrofe_version_major = "0"; -std::string retrofe_version_minor = "7"; -std::string retrofe_version_build = "21"; +std::string retrofe_version_minor = "8"; +std::string retrofe_version_build = "0 - RC1"; std::string Version::getString()