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

BUG correction in PageBuilder: ReloadableScrollingText arguments were in incorrect order

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-11-11 16:12:18 +01:00
parent 4464de67e1
commit bda5f1bda8
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp
View File

@ -28,7 +28,14 @@
#include <algorithm> #include <algorithm>
ReloadableScrollingText::ReloadableScrollingText(Configuration &config, bool systemMode, bool layoutMode, bool menuMode, std::string type, std::string textFormat, std::string singlePrefix, std::string singlePostfix, std::string pluralPrefix, std::string pluralPostfix, std::string alignment, Page &p, int displayOffset, Font *font, float scaleX, float scaleY, std::string direction, float scrollingSpeed, float startPosition, float startTime, float endTime ) ReloadableScrollingText::ReloadableScrollingText(Configuration &config, bool systemMode,
bool layoutMode, bool menuMode,
std::string type, std::string textFormat, std::string singlePrefix,
std::string singlePostfix, std::string pluralPrefix, std::string pluralPostfix,
std::string alignment, Page &p, int displayOffset, Font *font,
float scaleX, float scaleY, std::string direction, float scrollingSpeed,
float startPosition, float startTime, float endTime )
: Component(p) : Component(p)
, config_(config) , config_(config)
, systemMode_(systemMode) , systemMode_(systemMode)
@ -504,7 +511,6 @@ void ReloadableScrollingText::loadText( std::string collection, std::string type
while(std::getline(includeStream, line)) while(std::getline(includeStream, line))
{ {
// In horizontal scrolling direction, add a space before every line except the first. // In horizontal scrolling direction, add a space before every line except the first.
if (direction_ == "horizontal" && !text_.empty( )) if (direction_ == "horizontal" && !text_.empty( ))
{ {

2
RetroFE/Source/Graphics/PageBuilder.cpp
View File

@ -778,7 +778,7 @@ void PageBuilder::loadReloadableImages(xml_node<> *layout, std::string tagName,
{ {
pluralPostfix = pluralPostfixXml->value(); pluralPostfix = pluralPostfixXml->value();
} }
c = new ReloadableScrollingText(config_, systemMode, layoutMode, menuMode, type->value(), singlePrefix, singlePostfix, pluralPrefix, pluralPostfix, textFormat, alignment, *page, selectedOffset, font, scaleX_, scaleY_, direction, scrollingSpeed, startPosition, startTime, endTime); c = new ReloadableScrollingText(config_, systemMode, layoutMode, menuMode, type->value(), textFormat, singlePrefix, singlePostfix, pluralPrefix, pluralPostfix, alignment, *page, selectedOffset, font, scaleX_, scaleY_, direction, scrollingSpeed, startPosition, startTime, endTime);
c->setId( id ); c->setId( id );
xml_attribute<> *menuScrollReload = componentXml->first_attribute("menuScrollReload"); xml_attribute<> *menuScrollReload = componentXml->first_attribute("menuScrollReload");
if (menuScrollReload && if (menuScrollReload &&

6
RetroFE/Source/Menu/MenuMode.cpp
View File

@ -26,9 +26,9 @@
#define SCREEN_HORIZONTAL_SIZE 240 //RES_HW_SCREEN_HORIZONTAL #define SCREEN_HORIZONTAL_SIZE 240 //RES_HW_SCREEN_HORIZONTAL
#define SCREEN_VERTICAL_SIZE 240 //RES_HW_SCREEN_VERTICAL #define SCREEN_VERTICAL_SIZE 240 //RES_HW_SCREEN_VERTICAL
#define SCROLL_SPEED_PX 30 //This means no animations but also no tearing effect #define SCROLL_SPEED_PX 30
#define FPS_MENU 50 #define FPS_MENU 60
#define ARROWS_PADDING 8 #define ARROWS_PADDING 8
#define MENU_ZONE_WIDTH SCREEN_HORIZONTAL_SIZE #define MENU_ZONE_WIDTH SCREEN_HORIZONTAL_SIZE
#define MENU_ZONE_HEIGHT SCREEN_VERTICAL_SIZE #define MENU_ZONE_HEIGHT SCREEN_VERTICAL_SIZE