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

Added support for setting one of the itemSize property axes to -1 to get square GridComponent items.

Browse source
This commit is contained in:
Leon Styhre 2022-12-10 14:31:04 +01:00
parent 4e56dafc59
commit f0e3addee6
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -722,8 +722,21 @@ void GridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mFractionalRows = (elem->has("fractionalRows") && elem->get<bool>("fractionalRows")); mFractionalRows = (elem->has("fractionalRows") && elem->get<bool>("fractionalRows"));
if (elem->has("itemSize")) { if (elem->has("itemSize")) {
const glm::vec2& itemSize {glm::clamp(elem->get<glm::vec2>("itemSize"), 0.05f, 1.0f)}; const glm::vec2& itemSize {elem->get<glm::vec2>("itemSize")};
mItemSize = itemSize * glm::vec2(Renderer::getScreenWidth(), Renderer::getScreenHeight()); if (!(itemSize.x == -1 && itemSize.y == -1)) {
if (itemSize.x == -1) {
mItemSize.y = glm::clamp(itemSize.y, 0.05f, 1.0f) * mRenderer->getScreenHeight();
mItemSize.x = mItemSize.y;
}
else if (itemSize.y == -1) {
mItemSize.x = glm::clamp(itemSize.x, 0.05f, 1.0f) * mRenderer->getScreenWidth();
mItemSize.y = mItemSize.x;
}
else {
mItemSize = glm::clamp(itemSize, 0.05f, 1.0f) *
glm::vec2(mRenderer->getScreenWidth(), mRenderer->getScreenHeight());
}
}
} }
if (elem->has("itemScale")) if (elem->has("itemScale"))