Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 07:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed a value for the itemTransitions property for the carousel and grid components.

Browse source 
Also changed the position of a grid property and set the minimum columns value to 1.
This commit is contained in:
Leon Styhre 2022-11-13 23:04:48 +01:00
parent 9013faf445
commit be903c0a86
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,8 +160,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"defaultItem", PATH},
{"itemSize", NORMALIZED_PAIR},
{"itemScale", FLOAT},
{"itemSpacing", NORMALIZED_PAIR},
{"itemTransitions", STRING},
{"itemSpacing", NORMALIZED_PAIR},
{"itemHorizontalAlignment", STRING},
{"itemVerticalAlignment", STRING},
{"horizontalOffset", FLOAT},

2
es-core/src/components/primary/CarouselComponent.h
View file

@ -1010,7 +1010,7 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("itemTransitions")) {
const std::string& itemTransitions {elem->get<std::string>("itemTransitions")};
if (itemTransitions == "slide") {
if (itemTransitions == "animate") {
mInstantItemTransitions = false;
}
else if (itemTransitions == "instant") {

4
es-core/src/components/primary/GridComponent.h
View file

@ -434,7 +434,7 @@ void GridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
return;
if (elem->has("columns"))
mColumns = glm::clamp(elem->get<unsigned int>("columns"), 0u, 100u);
mColumns = glm::clamp(elem->get<unsigned int>("columns"), 1u, 100u);
if (elem->has("itemSize")) {
const glm::vec2& itemSize {glm::clamp(elem->get<glm::vec2>("itemSize"), 0.05f, 1.0f)};
@ -446,7 +446,7 @@ void GridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("itemTransitions")) {
const std::string& itemTransitions {elem->get<std::string>("itemTransitions")};
if (itemTransitions == "scale") {
if (itemTransitions == "animate") {
mInstantItemTransitions = false;
}
else if (itemTransitions == "instant") {