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

Improved some invalid theme configuration warnings in ImageComponent.

Browse source
This commit is contained in:
Leon Styhre 2022-09-15 21:53:26 +02:00
parent 47c8f5988d
commit 611824be18
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
es-core/src/components/ImageComponent.cpp
View file

@ -410,7 +410,7 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("size")) { if (elem->has("size")) {
glm::vec2 imageSize {elem->get<glm::vec2>("size")}; glm::vec2 imageSize {elem->get<glm::vec2>("size")};
if (imageSize == glm::vec2 {0.0f, 0.0f}) { if (imageSize == glm::vec2 {0.0f, 0.0f}) {
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property <size> " LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property \"size\" "
"for element \"" "for element \""
<< element.substr(6) << "\" is set to zero"; << element.substr(6) << "\" is set to zero";
imageSize = {0.001f, 0.001f}; imageSize = {0.001f, 0.001f};
@ -442,8 +442,8 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
else { else {
mLinearInterpolation = false; mLinearInterpolation = false;
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property " LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<interpolation> defined as \"" "\"interpolation\" for element \""
<< interpolation << "\""; << element.substr(6) << "\" defined as \"" << interpolation << "\"";
} }
} }
@ -464,7 +464,7 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
glm::vec2 tileSize {elem->get<glm::vec2>("tileSize")}; glm::vec2 tileSize {elem->get<glm::vec2>("tileSize")};
if (tileSize.x == 0.0f && tileSize.y == 0.0f) { if (tileSize.x == 0.0f && tileSize.y == 0.0f) {
LOG(LogWarning) LOG(LogWarning)
<< "ImageComponent: Invalid theme configuration, property <tileSize> " << "ImageComponent: Invalid theme configuration, property \"tileSize\" "
"for element \"" "for element \""
<< element.substr(6) << "\" is set to zero"; << element.substr(6) << "\" is set to zero";
tile = false; tile = false;
@ -495,7 +495,7 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
else { else {
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property " LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<tileHorizontalAlignment> for element \"" "\"tileHorizontalAlignment\" for element \""
<< element.substr(6) << "\" defined as \"" << alignment << "\""; << element.substr(6) << "\" defined as \"" << alignment << "\"";
mTileHorizontalAlignment = ALIGN_LEFT; mTileHorizontalAlignment = ALIGN_LEFT;
} }
@ -512,7 +512,7 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
else { else {
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property " LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<tileVerticalAlignment> for element \"" "\"tileVerticalAlignment\" for element \""
<< element.substr(6) << "\" defined as \"" << alignment << "\""; << element.substr(6) << "\" defined as \"" << alignment << "\"";
mTileVerticalAlignment = ALIGN_TOP; mTileVerticalAlignment = ALIGN_TOP;
} }
@ -531,17 +531,18 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
mThemeImageTypes = Utils::String::delimitedStringToVector(imageTypes, ","); mThemeImageTypes = Utils::String::delimitedStringToVector(imageTypes, ",");
if (mThemeImageTypes.empty()) { if (mThemeImageTypes.empty()) {
LOG(LogError) << "ImageComponent: Invalid theme configuration, property <imageType> " LOG(LogError) << "ImageComponent: Invalid theme configuration, property \"imageType\" "
"contains no values"; "for element \""
<< element.substr(6) << "\" contains no values";
} }
for (std::string& type : mThemeImageTypes) { for (std::string& type : mThemeImageTypes) {
if (std::find(supportedImageTypes.cbegin(), supportedImageTypes.cend(), type) == if (std::find(supportedImageTypes.cbegin(), supportedImageTypes.cend(), type) ==
supportedImageTypes.cend()) { supportedImageTypes.cend()) {
LOG(LogError) LOG(LogError)
<< "ImageComponent: Invalid theme configuration, property <imageType> " << "ImageComponent: Invalid theme configuration, property \"imageType\" "
"defined as \"" "for element \""
<< type << "\""; << element.substr(6) << "\" defined as \"" << type << "\"";
mThemeImageTypes.clear(); mThemeImageTypes.clear();
break; break;
} }
@ -551,8 +552,9 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
std::stable_sort(sortedTypes.begin(), sortedTypes.end()); std::stable_sort(sortedTypes.begin(), sortedTypes.end());
if (std::adjacent_find(sortedTypes.begin(), sortedTypes.end()) != sortedTypes.end()) { if (std::adjacent_find(sortedTypes.begin(), sortedTypes.end()) != sortedTypes.end()) {
LOG(LogError) << "ImageComponent: Invalid theme configuration, property <imageType> " LOG(LogError) << "ImageComponent: Invalid theme configuration, property \"imageType\" "
"contains duplicate values"; "for element \""
<< element.substr(6) << "\" contains duplicate values";
mThemeImageTypes.clear(); mThemeImageTypes.clear();
} }
} }
@ -576,8 +578,8 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
else { else {
setColorGradientHorizontal(true); setColorGradientHorizontal(true);
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property " LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<gradientType> defined as \"" "\"gradientType\" for element \""
<< gradientType << "\""; << element.substr(6) << "\" defined as \"" << gradientType << "\"";
} }
} }
} }