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

Updated ThemeData to more strictly enforce the new theme engine format.

Browse source
This commit is contained in:
Leon Styhre 2022-01-30 21:13:49 +01:00
parent e96aa82dd3
commit 1dd5e52760
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1014,9 +1014,8 @@ void ThemeData::parseView(const pugi::xml_node& root, ThemeView& view)
view.elements.insert(std::pair<std::string, ThemeElement>(elemKey, ThemeElement()))
.first->second);
// TEMPORARY
// if (mLegacyTheme && std::find(view.orderedKeys.cbegin(), view.orderedKeys.cend(),
if (std::find(view.legacyOrderedKeys.cbegin(), view.legacyOrderedKeys.cend(),
if (mLegacyTheme &&
std::find(view.legacyOrderedKeys.cbegin(), view.legacyOrderedKeys.cend(),
elemKey) == view.legacyOrderedKeys.cend())
view.legacyOrderedKeys.push_back(elemKey);
}
@ -1033,12 +1032,11 @@ void ThemeData::parseElement(const pugi::xml_node& root,
element.type = root.name();
// TEMPORARY
element.extra = root.attribute("extra").as_bool(false);
// if (mLegacyTheme)
// element.extra = root.attribute("extra").as_bool(false);
// else if (!mLegacyTheme && std::string(root.attribute("extra").as_string("")) != "")
// throw error << ": Legacy \"extra\" attribute found for non-legacy theme set";
if (mLegacyTheme)
element.extra = root.attribute("extra").as_bool(false);
else if (!mLegacyTheme && std::string(root.attribute("extra").as_string("")) != "")
throw error << ": Legacy \"extra\" attribute found for non-legacy theme set";
for (pugi::xml_node node = root.first_child(); node; node = node.next_sibling()) {
auto typeIt = typeMap.find(node.name());