funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-01-27 02:05:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved next/previous page/letter scrolling, and preparing for 0.8.0 release candidate release(s).

Browse Source
This commit is contained in:
Pieter Hulshoff 2017-03-30 14:10:35 +02:00
parent cc17a04a7d
commit afeb633f9e
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
RetroFE/Source/RetroFE.cpp
View File

@ -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))
{

2
RetroFE/Source/RetroFE.h
View File

@ -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,

4
RetroFE/Source/Version.cpp
View File

@ -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()