Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for overriding variables and to define them inside the variants tags.

Browse source
This commit is contained in:
Leon Styhre 2022-10-28 21:06:01 +02:00
parent 7e2818c854
commit b1a2b3f5ca
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -986,6 +986,7 @@ void ThemeData::parseVariants(const pugi::xml_node& root)
}
if (mSelectedVariant == viewKey) {
parseVariables(node);
parseIncludes(node);
parseViews(node);
}
@ -1040,17 +1041,21 @@ void ThemeData::parseVariables(const pugi::xml_node& root)
ThemeException error;
error.setFiles(mPaths);
pugi::xml_node variables {root.child("variables")};
for (pugi::xml_node node = root.child("variables"); node;
node = node.next_sibling("variables")) {
if (!variables)
return;
for (pugi::xml_node_iterator it = node.begin(); it != node.end(); ++it) {
const std::string key {it->name()};
const std::string val {resolvePlaceholders(it->text().as_string())};
for (pugi::xml_node_iterator it = variables.begin(); it != variables.end(); ++it) {
std::string key {it->name()};
std::string val {resolvePlaceholders(it->text().as_string())};
if (!val.empty())
mVariables.insert(std::pair<std::string, std::string>(key, val));
if (!val.empty()) {
// Overriding existing variables is not allowed for legacy themes.
if (!mLegacyTheme && mVariables.find(key) != mVariables.end())
mVariables[key] = val;
else
mVariables.insert(std::pair<std::string, std::string>(key, val));
}
}
}
}