Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for the letterCase property when using the carousel in the gamelist view.

Browse source
This commit is contained in:
Leon Styhre 2022-08-21 18:15:06 +02:00
parent 08d5e4eff0
commit fca9e51844
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,9 @@ private:
int mPreviousScrollVelocity; int mPreviousScrollVelocity;
bool mTriggerJump; bool mTriggerJump;
bool mGamelistView; bool mGamelistView;
bool mUppercase;
bool mLowercase;
bool mCapitalize;
CarouselType mType; CarouselType mType;
std::string mItemType; std::string mItemType;
@ -154,6 +157,9 @@ CarouselComponent<T>::CarouselComponent()
, mPreviousScrollVelocity {0} , mPreviousScrollVelocity {0}
, mTriggerJump {false} , mTriggerJump {false}
, mGamelistView {std::is_same_v<T, FileData*> ? true : false} , mGamelistView {std::is_same_v<T, FileData*> ? true : false}
, mUppercase {false}
, mLowercase {false}
, mCapitalize {false}
, mType {CarouselType::HORIZONTAL} , mType {CarouselType::HORIZONTAL}
, mLegacyMode {false} , mLegacyMode {false}
, mFont {Font::get(FONT_SIZE_LARGE)} , mFont {Font::get(FONT_SIZE_LARGE)}
@ -237,7 +243,19 @@ void CarouselComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeDat
if (!entry.data.item) { if (!entry.data.item) {
// If no item image is present, add item text as fallback. // If no item image is present, add item text as fallback.
auto text = std::make_shared<TextComponent>(entry.name, mFont, 0x000000FF, ALIGN_CENTER); std::string nameEntry;
if (!mGamelistView)
nameEntry = entry.name;
else if (mUppercase)
nameEntry = Utils::String::toUpper(entry.name);
else if (mLowercase)
nameEntry = Utils::String::toLower(entry.name);
else if (mCapitalize)
nameEntry = Utils::String::toCapitalized(entry.name);
else
nameEntry = entry.name;
auto text = std::make_shared<TextComponent>(nameEntry, mFont, 0x000000FF, ALIGN_CENTER);
text->setSize(mItemSize * mItemScale); text->setSize(mItemSize * mItemScale);
if (legacyMode) { if (legacyMode) {
text->applyTheme(theme, "system", "text_logoText", text->applyTheme(theme, "system", "text_logoText",
@ -732,6 +750,9 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mCarouselColorEnd = 0xFFFFFFD8; mCarouselColorEnd = 0xFFFFFFD8;
mZIndex = mDefaultZIndex; mZIndex = mDefaultZIndex;
mText = ""; mText = "";
mUppercase = false;
mLowercase = false;
mCapitalize = false;
if (!elem) if (!elem)
return; return;
@ -988,28 +1009,35 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mLineSpacing = glm::clamp(elem->get<float>("lineSpacing"), 0.5f, 3.0f); mLineSpacing = glm::clamp(elem->get<float>("lineSpacing"), 0.5f, 3.0f);
std::string letterCase; std::string letterCase;
bool hasText {!mGamelistView && elem->has("text")};
if (elem->has("letterCase")) if (elem->has("letterCase")) {
letterCase = elem->get<std::string>("letterCase"); letterCase = elem->get<std::string>("letterCase");
if (elem->has("text")) {
if (letterCase == "uppercase") { if (letterCase == "uppercase") {
mText = Utils::String::toUpper(elem->get<std::string>("text")); mUppercase = true;
if (hasText)
mText = Utils::String::toUpper(elem->get<std::string>("text"));
} }
else if (letterCase == "lowercase") { else if (letterCase == "lowercase") {
mText = Utils::String::toLower(elem->get<std::string>("text")); mLowercase = true;
if (hasText)
mText = Utils::String::toLower(elem->get<std::string>("text"));
} }
else if (letterCase == "capitalize") { else if (letterCase == "capitalize") {
mText = Utils::String::toCapitalized(elem->get<std::string>("text")); mCapitalize = true;
if (hasText)
mText = Utils::String::toCapitalized(elem->get<std::string>("text"));
} }
else if (letterCase == "none") { else if (hasText && letterCase == "none") {
mText = elem->get<std::string>("text"); mText = elem->get<std::string>("text");
} }
else { else {
LOG(LogWarning) << "CarouselComponent: Invalid theme configuration, property " LOG(LogWarning) << "CarouselComponent: Invalid theme configuration, property "
"<letterCase> defined as \"" "<letterCase> defined as \""
<< letterCase << "\""; << letterCase << "\"";
mText = elem->get<std::string>("text"); if (hasText)
mText = elem->get<std::string>("text");
} }
} }