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

Renamed suppressedTransitionEntries to suppressedTransitionProfiles.

Browse source
This commit is contained in:
Leon Styhre 2023-01-08 19:30:16 +01:00
parent 3d5eb2a3cf
commit 656c3661ea
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
es-app/src/guis/GuiMenu.cpp
View file

@ -360,24 +360,24 @@ void GuiMenu::openUIOptions()
transitionAnim == selectedTransitionAnimation); transitionAnim == selectedTransitionAnimation);
} }
} }
if (std::find(currentSet->second.capabilities.suppressedTransitionEntries.cbegin(), if (std::find(currentSet->second.capabilities.suppressedTransitionProfiles.cbegin(),
currentSet->second.capabilities.suppressedTransitionEntries.cend(), currentSet->second.capabilities.suppressedTransitionProfiles.cend(),
"builtin-instant") == "builtin-instant") ==
currentSet->second.capabilities.suppressedTransitionEntries.cend()) { currentSet->second.capabilities.suppressedTransitionProfiles.cend()) {
themeTransitionAnimations->add("INSTANT (BUILT-IN)", "builtin-instant", themeTransitionAnimations->add("INSTANT (BUILT-IN)", "builtin-instant",
"builtin-instant" == selectedTransitionAnimation); "builtin-instant" == selectedTransitionAnimation);
} }
if (std::find(currentSet->second.capabilities.suppressedTransitionEntries.cbegin(), if (std::find(currentSet->second.capabilities.suppressedTransitionProfiles.cbegin(),
currentSet->second.capabilities.suppressedTransitionEntries.cend(), currentSet->second.capabilities.suppressedTransitionProfiles.cend(),
"builtin-slide") == "builtin-slide") ==
currentSet->second.capabilities.suppressedTransitionEntries.cend()) { currentSet->second.capabilities.suppressedTransitionProfiles.cend()) {
themeTransitionAnimations->add("SLIDE (BUILT-IN)", "builtin-slide", themeTransitionAnimations->add("SLIDE (BUILT-IN)", "builtin-slide",
"builtin-slide" == selectedTransitionAnimation); "builtin-slide" == selectedTransitionAnimation);
} }
if (std::find(currentSet->second.capabilities.suppressedTransitionEntries.cbegin(), if (std::find(currentSet->second.capabilities.suppressedTransitionProfiles.cbegin(),
currentSet->second.capabilities.suppressedTransitionEntries.cend(), currentSet->second.capabilities.suppressedTransitionProfiles.cend(),
"builtin-fade") == "builtin-fade") ==
currentSet->second.capabilities.suppressedTransitionEntries.cend()) { currentSet->second.capabilities.suppressedTransitionProfiles.cend()) {
themeTransitionAnimations->add("FADE (BUILT-IN)", "builtin-fade", themeTransitionAnimations->add("FADE (BUILT-IN)", "builtin-fade",
"builtin-fade" == selectedTransitionAnimation); "builtin-fade" == selectedTransitionAnimation);
} }

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

@ -906,10 +906,10 @@ void ThemeData::setThemeTransitions()
} }
else if (transitionSetting == "builtin-slide" || transitionSetting == "builtin-fade") { else if (transitionSetting == "builtin-slide" || transitionSetting == "builtin-fade") {
if (std::find( if (std::find(
mCurrentThemeSet->second.capabilities.suppressedTransitionEntries.cbegin(), mCurrentThemeSet->second.capabilities.suppressedTransitionProfiles.cbegin(),
mCurrentThemeSet->second.capabilities.suppressedTransitionEntries.cend(), mCurrentThemeSet->second.capabilities.suppressedTransitionProfiles.cend(),
transitionSetting) == transitionSetting) ==
mCurrentThemeSet->second.capabilities.suppressedTransitionEntries.cend()) { mCurrentThemeSet->second.capabilities.suppressedTransitionProfiles.cend()) {
if (transitionSetting == "builtin-slide") { if (transitionSetting == "builtin-slide") {
transitionAnim = static_cast<int>(ViewTransitionAnimation::SLIDE); transitionAnim = static_cast<int>(ViewTransitionAnimation::SLIDE);
} }
@ -1350,37 +1350,37 @@ ThemeData::ThemeCapability ThemeData::parseThemeCapabilities(const std::string&
} }
} }
for (pugi::xml_node suppressTransitionEntries { for (pugi::xml_node suppressTransitionProfiles {
themeCapabilities.child("suppressTransitionEntries")}; themeCapabilities.child("suppressTransitionProfiles")};
suppressTransitionEntries; suppressTransitionProfiles;
suppressTransitionEntries = suppressTransitionProfiles =
suppressTransitionEntries.next_sibling("suppressTransitionEntries")) { suppressTransitionProfiles.next_sibling("suppressTransitionProfiles")) {
std::vector<std::string> readSuppressEntries; std::vector<std::string> readSuppressProfiles;
for (pugi::xml_node entries {suppressTransitionEntries.child("entry")}; entries; for (pugi::xml_node entries {suppressTransitionProfiles.child("entry")}; entries;
entries = entries.next_sibling("entry")) { entries = entries.next_sibling("entry")) {
const std::string& entryValue {entries.text().as_string()}; const std::string& entryValue {entries.text().as_string()};
if (std::find(sSupportedTransitionAnimations.cbegin(), if (std::find(sSupportedTransitionAnimations.cbegin(),
sSupportedTransitionAnimations.cend(), sSupportedTransitionAnimations.cend(),
entryValue) != sSupportedTransitionAnimations.cend()) { entryValue) != sSupportedTransitionAnimations.cend()) {
capabilities.suppressedTransitionEntries.emplace_back(entryValue); capabilities.suppressedTransitionProfiles.emplace_back(entryValue);
} }
else { else {
LOG(LogWarning) LOG(LogWarning)
<< "Found suppressTransitionEntries <entry> tag with invalid value \"" << "Found suppressTransitionProfiles <entry> tag with invalid value \""
<< entryValue << "\", ignoring entry in \"" << capFile << "\""; << entryValue << "\", ignoring entry in \"" << capFile << "\"";
} }
} }
// Sort and remove any duplicates. // Sort and remove any duplicates.
if (capabilities.suppressedTransitionEntries.size() > 1) { if (capabilities.suppressedTransitionProfiles.size() > 1) {
std::sort(capabilities.suppressedTransitionEntries.begin(), std::sort(capabilities.suppressedTransitionProfiles.begin(),
capabilities.suppressedTransitionEntries.end()); capabilities.suppressedTransitionProfiles.end());
auto last = std::unique(capabilities.suppressedTransitionEntries.begin(), auto last = std::unique(capabilities.suppressedTransitionProfiles.begin(),
capabilities.suppressedTransitionEntries.end()); capabilities.suppressedTransitionProfiles.end());
capabilities.suppressedTransitionEntries.erase( capabilities.suppressedTransitionProfiles.erase(
last, capabilities.suppressedTransitionEntries.end()); last, capabilities.suppressedTransitionProfiles.end());
} }
} }
} }

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

@ -216,7 +216,7 @@ public:
std::vector<ThemeColorScheme> colorSchemes; std::vector<ThemeColorScheme> colorSchemes;
std::vector<std::string> aspectRatios; std::vector<std::string> aspectRatios;
std::vector<ThemeTransitions> transitions; std::vector<ThemeTransitions> transitions;
std::vector<std::string> suppressedTransitionEntries; std::vector<std::string> suppressedTransitionProfiles;
bool legacyTheme; bool legacyTheme;
}; };