diff --git a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp index e5941ea..49f9143 100755 --- a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp @@ -28,7 +28,14 @@ #include -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) , config_(config) , systemMode_(systemMode) @@ -504,7 +511,6 @@ void ReloadableScrollingText::loadText( std::string collection, std::string type while(std::getline(includeStream, line)) { - // In horizontal scrolling direction, add a space before every line except the first. if (direction_ == "horizontal" && !text_.empty( )) { diff --git a/RetroFE/Source/Graphics/PageBuilder.cpp b/RetroFE/Source/Graphics/PageBuilder.cpp index b4665c1..4588691 100755 --- a/RetroFE/Source/Graphics/PageBuilder.cpp +++ b/RetroFE/Source/Graphics/PageBuilder.cpp @@ -778,7 +778,7 @@ void PageBuilder::loadReloadableImages(xml_node<> *layout, std::string tagName, { 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 ); xml_attribute<> *menuScrollReload = componentXml->first_attribute("menuScrollReload"); if (menuScrollReload && diff --git a/RetroFE/Source/Menu/MenuMode.cpp b/RetroFE/Source/Menu/MenuMode.cpp index b48d178..72552b3 100755 --- a/RetroFE/Source/Menu/MenuMode.cpp +++ b/RetroFE/Source/Menu/MenuMode.cpp @@ -26,9 +26,9 @@ #define SCREEN_HORIZONTAL_SIZE 240 //RES_HW_SCREEN_HORIZONTAL #define SCREEN_VERTICAL_SIZE 240 //RES_HW_SCREEN_VERTICAL -#define SCROLL_SPEED_PX 30 //This means no animations but also no tearing effect -#define FPS_MENU 50 -#define ARROWS_PADDING 8 +#define SCROLL_SPEED_PX 30 +#define FPS_MENU 60 +#define ARROWS_PADDING 8 #define MENU_ZONE_WIDTH SCREEN_HORIZONTAL_SIZE #define MENU_ZONE_HEIGHT SCREEN_VERTICAL_SIZE