Skip to content

Commit bda5f1b

Browse files
committed
BUG correction in PageBuilder: ReloadableScrollingText arguments were in incorrect order
Signed-off-by: Vincent-FK <[email protected]>
1 parent 4464de6 commit bda5f1b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,14 @@
2828
#include <algorithm>
2929

3030

31-
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 )
31+
ReloadableScrollingText::ReloadableScrollingText(Configuration &config, bool systemMode,
32+
bool layoutMode, bool menuMode,
33+
std::string type, std::string textFormat, std::string singlePrefix,
34+
std::string singlePostfix, std::string pluralPrefix, std::string pluralPostfix,
35+
std::string alignment, Page &p, int displayOffset, Font *font,
36+
float scaleX, float scaleY, std::string direction, float scrollingSpeed,
37+
float startPosition, float startTime, float endTime )
38+
3239
: Component(p)
3340
, config_(config)
3441
, systemMode_(systemMode)
@@ -504,7 +511,6 @@ void ReloadableScrollingText::loadText( std::string collection, std::string type
504511

505512
while(std::getline(includeStream, line))
506513
{
507-
508514
// In horizontal scrolling direction, add a space before every line except the first.
509515
if (direction_ == "horizontal" && !text_.empty( ))
510516
{

RetroFE/Source/Graphics/PageBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ void PageBuilder::loadReloadableImages(xml_node<> *layout, std::string tagName,
778778
{
779779
pluralPostfix = pluralPostfixXml->value();
780780
}
781-
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);
781+
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);
782782
c->setId( id );
783783
xml_attribute<> *menuScrollReload = componentXml->first_attribute("menuScrollReload");
784784
if (menuScrollReload &&

RetroFE/Source/Menu/MenuMode.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#define SCREEN_HORIZONTAL_SIZE 240 //RES_HW_SCREEN_HORIZONTAL
2727
#define SCREEN_VERTICAL_SIZE 240 //RES_HW_SCREEN_VERTICAL
2828

29-
#define SCROLL_SPEED_PX 30 //This means no animations but also no tearing effect
30-
#define FPS_MENU 50
31-
#define ARROWS_PADDING 8
29+
#define SCROLL_SPEED_PX 30
30+
#define FPS_MENU 60
31+
#define ARROWS_PADDING 8
3232

3333
#define MENU_ZONE_WIDTH SCREEN_HORIZONTAL_SIZE
3434
#define MENU_ZONE_HEIGHT SCREEN_VERTICAL_SIZE

0 commit comments

Comments
 (0)