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

Added a new cropSize property to the image element.

Browse source
This commit is contained in:
Leon Styhre 2023-03-01 20:13:07 +01:00
parent fa7b317982
commit b9a2a146b7
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,6 +169,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"reflectionsOpacity", FLOAT}, {"reflectionsOpacity", FLOAT},
{"reflectionsFalloff", FLOAT}, {"reflectionsFalloff", FLOAT},
{"unfocusedItemOpacity", FLOAT}, {"unfocusedItemOpacity", FLOAT},
{"imageFit", STRING},
{"fastScrolling", BOOLEAN}, {"fastScrolling", BOOLEAN},
{"defaultLogo", PATH}, // For backward compatibility with legacy themes. {"defaultLogo", PATH}, // For backward compatibility with legacy themes.
{"logoSize", NORMALIZED_PAIR}, // For backward compatibility with legacy themes. {"logoSize", NORMALIZED_PAIR}, // For backward compatibility with legacy themes.
@ -286,6 +287,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"image", {"image",
{{"pos", NORMALIZED_PAIR}, {{"pos", NORMALIZED_PAIR},
{"size", NORMALIZED_PAIR}, {"size", NORMALIZED_PAIR},
{"cropSize", NORMALIZED_PAIR},
{"maxSize", NORMALIZED_PAIR}, {"maxSize", NORMALIZED_PAIR},
{"origin", NORMALIZED_PAIR}, {"origin", NORMALIZED_PAIR},
{"rotation", FLOAT}, {"rotation", FLOAT},

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

@ -467,6 +467,12 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
imageMaxSize.y = glm::clamp(imageMaxSize.y, 0.001f, 3.0f); imageMaxSize.y = glm::clamp(imageMaxSize.y, 0.001f, 3.0f);
setMaxSize(imageMaxSize * scale); setMaxSize(imageMaxSize * scale);
} }
else if (elem->has("cropSize")) {
glm::vec2 imageCropSize {elem->get<glm::vec2>("cropSize")};
imageCropSize.x = glm::clamp(imageCropSize.x, 0.001f, 3.0f);
imageCropSize.y = glm::clamp(imageCropSize.y, 0.001f, 3.0f);
setCroppedSize(imageCropSize * scale);
}
} }
if (elem->has("interpolation")) { if (elem->has("interpolation")) {