Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-28 17:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added the ability to color shift badge icons, badge controller icons and badge folder link icons.

Browse source
This commit is contained in:
Leon Styhre 2023-01-28 11:27:05 +01:00
parent f3653a7d6d
commit 530fd26a3b
2 changed files with 102 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
es-core/src/ThemeData.cpp
View file

@ -361,6 +361,15 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"folderLinkPos", NORMALIZED_PAIR}, {"folderLinkPos", NORMALIZED_PAIR},
{"folderLinkSize", FLOAT}, {"folderLinkSize", FLOAT},
{"customFolderLinkIcon", PATH}, {"customFolderLinkIcon", PATH},
{"badgeIconColor", COLOR},
{"badgeIconColorEnd", COLOR},
{"badgeIconGradientType", STRING},
{"controllerIconColor", COLOR},
{"controllerIconColorEnd", COLOR},
{"controllerIconGradientType", STRING},
{"folderLinkIconColor", COLOR},
{"folderLinkIconColorEnd", COLOR},
{"folderLinkIconGradientType", STRING},
{"opacity", FLOAT}, {"opacity", FLOAT},
{"visible", BOOLEAN}, {"visible", BOOLEAN},
{"zIndex", FLOAT}}}, {"zIndex", FLOAT}}},

93
es-core/src/components/BadgeComponent.cpp
View file

@ -293,6 +293,84 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
} }
unsigned int badgeIconColorShift {0xFFFFFFFF};
unsigned int badgeIconColorShiftEnd {0xFFFFFFFF};
bool badgeIconColorGradientHorizontal {true};
if (elem->has("badgeIconColor")) {
badgeIconColorShift = elem->get<unsigned int>("badgeIconColor");
badgeIconColorShiftEnd = badgeIconColorShift;
}
if (elem->has("badgeIconColorEnd"))
badgeIconColorShiftEnd = elem->get<unsigned int>("badgeIconColorEnd");
if (elem->has("badgeIconGradientType")) {
const std::string& gradientType {elem->get<std::string>("badgeIconGradientType")};
if (gradientType == "horizontal") {
badgeIconColorGradientHorizontal = true;
}
else if (gradientType == "vertical") {
badgeIconColorGradientHorizontal = false;
}
else {
badgeIconColorGradientHorizontal = true;
LOG(LogWarning) << "BadgeComponent: Invalid theme configuration, property "
"\"badgeIconGradientType\" for element \""
<< element.substr(7) << "\" defined as \"" << gradientType << "\"";
}
}
unsigned int controllerIconColorShift {0xFFFFFFFF};
unsigned int controllerIconColorShiftEnd {0xFFFFFFFF};
bool controllerIconColorGradientHorizontal {true};
if (elem->has("controllerIconColor")) {
controllerIconColorShift = elem->get<unsigned int>("controllerIconColor");
controllerIconColorShiftEnd = controllerIconColorShift;
}
if (elem->has("controllerIconColorEnd"))
controllerIconColorShiftEnd = elem->get<unsigned int>("controllerIconColorEnd");
if (elem->has("controllerIconGradientType")) {
const std::string& gradientType {elem->get<std::string>("controllerIconGradientType")};
if (gradientType == "horizontal") {
controllerIconColorGradientHorizontal = true;
}
else if (gradientType == "vertical") {
controllerIconColorGradientHorizontal = false;
}
else {
controllerIconColorGradientHorizontal = true;
LOG(LogWarning) << "BadgeComponent: Invalid theme configuration, property "
"\"controllerIconGradientType\" for element \""
<< element.substr(7) << "\" defined as \"" << gradientType << "\"";
}
}
unsigned int folderLinkIconColorShift {0xFFFFFFFF};
unsigned int folderLinkIconColorShiftEnd {0xFFFFFFFF};
bool folderLinkIconColorGradientHorizontal {true};
if (elem->has("folderLinkIconColor")) {
folderLinkIconColorShift = elem->get<unsigned int>("folderLinkIconColor");
folderLinkIconColorShiftEnd = folderLinkIconColorShift;
}
if (elem->has("folderLinkIconColorEnd"))
folderLinkIconColorShiftEnd = elem->get<unsigned int>("folderLinkIconColorEnd");
if (elem->has("folderLinkIconGradientType")) {
const std::string& gradientType {elem->get<std::string>("folderLinkIconGradientType")};
if (gradientType == "horizontal") {
folderLinkIconColorGradientHorizontal = true;
}
else if (gradientType == "vertical") {
folderLinkIconColorGradientHorizontal = false;
}
else {
folderLinkIconColorGradientHorizontal = true;
LOG(LogWarning) << "BadgeComponent: Invalid theme configuration, property "
"\"folderLinkIconGradientType\" for element \""
<< element.substr(7) << "\" defined as \"" << gradientType << "\"";
}
}
if (elem->has("slots")) { if (elem->has("slots")) {
// Replace possible whitespace separators with commas. // Replace possible whitespace separators with commas.
std::string slotsTag {Utils::String::toLower(elem->get<std::string>("slots"))}; std::string slotsTag {Utils::String::toLower(elem->get<std::string>("slots"))};
@ -336,6 +414,11 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
item.baseImage = badgeImage; item.baseImage = badgeImage;
item.overlayImage = ImageComponent {false, false}; item.overlayImage = ImageComponent {false, false};
item.baseImage.setColorShift(badgeIconColorShift);
item.baseImage.setColorShiftEnd(badgeIconColorShiftEnd);
if (badgeIconColorGradientHorizontal != true)
item.baseImage.setColorGradientHorizontal(badgeIconColorGradientHorizontal);
if (slot == "folder") { if (slot == "folder") {
std::string folderLinkPath {":/graphics/badge_folderlink_overlay.svg"}; std::string folderLinkPath {":/graphics/badge_folderlink_overlay.svg"};
@ -355,6 +438,11 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
item.overlayImage.setImage(folderLinkPath); item.overlayImage.setImage(folderLinkPath);
item.overlayImage.setColorShift(folderLinkIconColorShift);
item.overlayImage.setColorShiftEnd(folderLinkIconColorShiftEnd);
if (folderLinkIconColorGradientHorizontal != true)
item.overlayImage.setColorGradientHorizontal(
folderLinkIconColorGradientHorizontal);
if (elem->has("folderLinkPos")) { if (elem->has("folderLinkPos")) {
glm::vec2 folderLinkPos {elem->get<glm::vec2>("folderLinkPos")}; glm::vec2 folderLinkPos {elem->get<glm::vec2>("folderLinkPos")};
@ -374,6 +462,11 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
controllerPos.x = glm::clamp(controllerPos.x, -1.0f, 2.0f); controllerPos.x = glm::clamp(controllerPos.x, -1.0f, 2.0f);
controllerPos.y = glm::clamp(controllerPos.y, -1.0f, 2.0f); controllerPos.y = glm::clamp(controllerPos.y, -1.0f, 2.0f);
item.overlayPosition = controllerPos; item.overlayPosition = controllerPos;
item.overlayImage.setColorShift(controllerIconColorShift);
item.overlayImage.setColorShiftEnd(controllerIconColorShiftEnd);
if (controllerIconColorGradientHorizontal != true)
item.overlayImage.setColorGradientHorizontal(
controllerIconColorGradientHorizontal);
} }
if (elem->has("controllerSize")) if (elem->has("controllerSize"))