Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changed the argument order for the TextComponent constructor.

Browse source
This commit is contained in:
Leon Styhre 2022-09-24 21:37:00 +02:00
parent a3db744700
commit 9d0b3b911f
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/guis/GuiScraperSearch.cpp
View file

@ -88,7 +88,7 @@ GuiScraperSearch::GuiScraperSearch(SearchType type, unsigned int scrapeCount)
mMD_ReleaseDate->setUppercase(true); mMD_ReleaseDate->setUppercase(true);
mMD_Developer = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT); mMD_Developer = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT);
mMD_Publisher = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT); mMD_Publisher = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT);
mMD_Genre = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT, glm::vec3 {}); mMD_Genre = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT);
mMD_Players = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT); mMD_Players = std::make_shared<TextComponent>("", font, mdColor, ALIGN_LEFT);
mMD_Filler = std::make_shared<TextComponent>("", font, mdColor); mMD_Filler = std::make_shared<TextComponent>("", font, mdColor);

4
es-core/src/components/DateTimeComponent.cpp
View file

@ -24,11 +24,11 @@ DateTimeComponent::DateTimeComponent()
DateTimeComponent::DateTimeComponent(const std::string& text, DateTimeComponent::DateTimeComponent(const std::string& text,
const std::shared_ptr<Font>& font, const std::shared_ptr<Font>& font,
unsigned int color, unsigned int color,
Alignment align, Alignment horizontalAlignment,
glm::vec3 pos, glm::vec3 pos,
glm::vec2 size, glm::vec2 size,
unsigned int bgcolor) unsigned int bgcolor)
: TextComponent {text, font, color, align, pos, size, bgcolor} : TextComponent {text, font, color, horizontalAlignment, ALIGN_CENTER, pos, size, bgcolor}
, mDisplayRelative {false} , mDisplayRelative {false}
{ {
// ISO 8601 date format. // ISO 8601 date format.

6
es-core/src/components/DateTimeComponent.h
View file

@ -24,9 +24,9 @@ public:
DateTimeComponent(const std::string& text, DateTimeComponent(const std::string& text,
const std::shared_ptr<Font>& font, const std::shared_ptr<Font>& font,
unsigned int color = 0x000000FF, unsigned int color = 0x000000FF,
Alignment align = ALIGN_LEFT, Alignment horizontalAlignment = ALIGN_LEFT,
glm::vec3 pos = {}, glm::vec3 pos = {0.0f, 0.0f, 0.0f},
glm::vec2 size = {}, glm::vec2 size = {0.0f, 0.0f},
unsigned int bgcolor = 0x00000000); unsigned int bgcolor = 0x00000000);
void render(const glm::mat4& parentTrans) override; void render(const glm::mat4& parentTrans) override;

4
es-core/src/components/TextComponent.cpp
View file

@ -37,10 +37,10 @@ TextComponent::TextComponent(const std::string& text,
const std::shared_ptr<Font>& font, const std::shared_ptr<Font>& font,
unsigned int color, unsigned int color,
Alignment horizontalAlignment, Alignment horizontalAlignment,
Alignment verticalAlignment,
glm::vec3 pos, glm::vec3 pos,
glm::vec2 size, glm::vec2 size,
unsigned int bgcolor, unsigned int bgcolor)
Alignment verticalAlignment)
: mFont {nullptr} : mFont {nullptr}
, mRenderer {Renderer::getInstance()} , mRenderer {Renderer::getInstance()}
, mColor {0x000000FF} , mColor {0x000000FF}

4
es-core/src/components/TextComponent.h
View file

@ -29,10 +29,10 @@ public:
const std::shared_ptr<Font>& font, const std::shared_ptr<Font>& font,
unsigned int color = 0x000000FF, unsigned int color = 0x000000FF,
Alignment horizontalAlignment = ALIGN_LEFT, Alignment horizontalAlignment = ALIGN_LEFT,
Alignment verticalAlignment = ALIGN_CENTER,
glm::vec3 pos = {0.0f, 0.0f, 0.0f}, glm::vec3 pos = {0.0f, 0.0f, 0.0f},
glm::vec2 size = {0.0f, 0.0f}, glm::vec2 size = {0.0f, 0.0f},
unsigned int bgcolor = 0x00000000, unsigned int bgcolor = 0x00000000);
Alignment verticalAlignment = ALIGN_CENTER);
void setFont(const std::shared_ptr<Font>& font); void setFont(const std::shared_ptr<Font>& font);
void setUppercase(bool uppercase); void setUppercase(bool uppercase);

4
es-core/src/components/primary/CarouselComponent.h
View file

@ -271,8 +271,8 @@ void CarouselComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeDat
nameEntry = entry.name; nameEntry = entry.name;
auto text = std::make_shared<TextComponent>( auto text = std::make_shared<TextComponent>(
nameEntry, mFont, 0x000000FF, mItemHorizontalAlignment, glm::vec3 {0.0f, 0.0f, 0.0f}, nameEntry, mFont, 0x000000FF, mItemHorizontalAlignment, mItemVerticalAlignment,
mItemSize * mItemScale, 0x00000000, mItemVerticalAlignment); glm::vec3 {0.0f, 0.0f, 0.0f}, mItemSize * mItemScale, 0x00000000);
if (legacyMode) { if (legacyMode) {
text->applyTheme(theme, "system", "text_logoText", text->applyTheme(theme, "system", "text_logoText",
ThemeFlags::FONT_PATH | ThemeFlags::FONT_SIZE | ThemeFlags::COLOR | ThemeFlags::FONT_PATH | ThemeFlags::FONT_SIZE | ThemeFlags::COLOR |