funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-28 17:09:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged build 0.7.6

Browse Source
This commit is contained in:
Pieter Hulshoff
2016-08-25 15:28:45 +02:00
parent 3c86c5d848 051eec348f
commit f8fffad95b
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RetroFE/Source/Execute/AttractMode.cpp
View File

@@ -53,7 +53,12 @@ void AttractMode::update(float dt, Page &page)
{ {
elapsedTime_ = 0; elapsedTime_ = 0;
isActive_ = false; isActive_ = false;
page.setScrolling(Page::ScrollDirectionIdle);
} }
} }
} }
bool AttractMode::isActive()
{
return isActive_;
}

1
RetroFE/Source/Execute/AttractMode.h
View File

@@ -24,6 +24,7 @@ public:
void reset(); void reset();
void update(float dt, Page &page); void update(float dt, Page &page);
float idleTime; float idleTime;
bool isActive();
private: private:
bool isActive_; bool isActive_;

3
RetroFE/Source/RetroFE.cpp
View File

@@ -724,7 +724,8 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
!input_.keystate(UserInput::KeyCodeDown) && !input_.keystate(UserInput::KeyCodeDown) &&
!input_.keystate(UserInput::KeyCodeRight) && !input_.keystate(UserInput::KeyCodeRight) &&
!input_.keystate(UserInput::KeyCodePageUp) && !input_.keystate(UserInput::KeyCodePageUp) &&
!input_.keystate(UserInput::KeyCodePageDown)) !input_.keystate(UserInput::KeyCodePageDown) &&
!attract_.isActive())
{ {
if (page->isMenuScrolling()) if (page->isMenuScrolling())
state = RETROFE_HIGHLIGHT_REQUEST; state = RETROFE_HIGHLIGHT_REQUEST;

2
RetroFE/Source/Version.cpp
View File

@@ -20,7 +20,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "7"; std::string retrofe_version_minor = "7";
std::string retrofe_version_build = "5"; std::string retrofe_version_build = "6";
std::string Version::getString() std::string Version::getString()