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

Removed support for all deprecated theme properties.

Browse source
This commit is contained in:
Leon Styhre 2023-01-04 21:36:22 +01:00
parent b1dbd28be0
commit ad973e1ffa
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,14 +66,8 @@ std::vector<std::string> ThemeData::sLegacyProperties {
{"logoRotation"}, {"logoRotation"},
{"logoRotationOrigin"}, {"logoRotationOrigin"},
{"logoAlignment"}, {"logoAlignment"},
{"maxLogoCount"}}; {"maxLogoCount"},
{"selectorOffsetY"}};
std::vector<std::string> ThemeData::sDeprecatedProperties {
{"selectorOffsetY"},
{"staticItem"},
{"itemType"},
{"defaultItem"},
{"itemInterpolation"}};
std::vector<std::pair<std::string, std::string>> ThemeData::sSupportedAspectRatios { std::vector<std::pair<std::string, std::string>> ThemeData::sSupportedAspectRatios {
{"automatic", "automatic"}, {"automatic", "automatic"},
@ -128,9 +122,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"staticImage", PATH}, {"staticImage", PATH},
{"imageType", STRING}, {"imageType", STRING},
{"defaultImage", PATH}, {"defaultImage", PATH},
{"staticItem", PATH}, // TEMPORARY: For backward compatibility.
{"itemType", STRING}, // TEMPORARY: For backward compatibility.
{"defaultItem", PATH}, // TEMPORARY: For backward compatibility.
{"maxItemCount", FLOAT}, {"maxItemCount", FLOAT},
{"maxLogoCount", FLOAT}, // For backward compatibility with legacy themes. {"maxLogoCount", FLOAT}, // For backward compatibility with legacy themes.
{"itemsBeforeCenter", UNSIGNED_INTEGER}, {"itemsBeforeCenter", UNSIGNED_INTEGER},
@ -141,7 +132,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"itemRotation", FLOAT}, {"itemRotation", FLOAT},
{"itemRotationOrigin", NORMALIZED_PAIR}, {"itemRotationOrigin", NORMALIZED_PAIR},
{"itemAxisHorizontal", BOOLEAN}, {"itemAxisHorizontal", BOOLEAN},
{"itemInterpolation", STRING}, // TEMPORARY: For backward compatibility.
{"imageInterpolation", STRING}, {"imageInterpolation", STRING},
{"imageColor", COLOR}, {"imageColor", COLOR},
{"imageColorEnd", COLOR}, {"imageColorEnd", COLOR},
@ -193,7 +183,6 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"itemTransitions", STRING}, {"itemTransitions", STRING},
{"rowTransitions", STRING}, {"rowTransitions", STRING},
{"unfocusedItemOpacity", FLOAT}, {"unfocusedItemOpacity", FLOAT},
{"edgeScaleInwards", BOOLEAN}, // TODO
{"imageFit", STRING}, {"imageFit", STRING},
{"imageRelativeScale", FLOAT}, {"imageRelativeScale", FLOAT},
{"imageColor", COLOR}, {"imageColor", COLOR},
@ -1615,18 +1604,6 @@ void ThemeData::parseElement(const pugi::xml_node& root,
} }
} }
// Print a warning if a deprecated property is used for a non-legacy theme set.
if (!mLegacyTheme) {
for (auto& deprecatedProperty : sDeprecatedProperties) {
if (nodeName == deprecatedProperty) {
LOG(LogWarning)
<< "ThemeData::parseElement(): Property \"" << deprecatedProperty
<< "\" is deprecated and support for it will be removed in a future "
"version";
}
}
}
// If an attribute exists, then replace nodeName with its name. // If an attribute exists, then replace nodeName with its name.
auto attributeEntry = sPropertyAttributeMap.find(element.type); auto attributeEntry = sPropertyAttributeMap.find(element.type);
if (attributeEntry != sPropertyAttributeMap.end()) { if (attributeEntry != sPropertyAttributeMap.end()) {

1
es-core/src/ThemeData.h
View file

@ -294,7 +294,6 @@ private:
static std::vector<std::string> sLegacySupportedViews; static std::vector<std::string> sLegacySupportedViews;
static std::vector<std::string> sLegacySupportedFeatures; static std::vector<std::string> sLegacySupportedFeatures;
static std::vector<std::string> sLegacyProperties; static std::vector<std::string> sLegacyProperties;
static std::vector<std::string> sDeprecatedProperties;
static std::vector<std::pair<std::string, std::string>> sSupportedAspectRatios; static std::vector<std::pair<std::string, std::string>> sSupportedAspectRatios;
static std::map<std::string, float> sAspectRatioMap; static std::map<std::string, float> sAspectRatioMap;