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

Fixed an issue where two BadgeComponent default values were not always set.

Browse source
This commit is contained in:
Leon Styhre 2022-04-15 21:26:07 +02:00
parent 5c7c62b16a
commit a149124252
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-core/src/components/BadgeComponent.cpp
View file

@ -241,6 +241,7 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
} }
mFlexboxComponent.setLines(3);
if (elem->has("lines")) { if (elem->has("lines")) {
const unsigned int lines {elem->get<unsigned int>("lines")}; const unsigned int lines {elem->get<unsigned int>("lines")};
if (lines < 1 || lines > 10) { if (lines < 1 || lines > 10) {
@ -251,10 +252,8 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
mFlexboxComponent.setLines(lines); mFlexboxComponent.setLines(lines);
} }
} }
else {
mFlexboxComponent.setLines(3);
}
mFlexboxComponent.setItemsPerLine(4);
if (elem->has("itemsPerLine")) { if (elem->has("itemsPerLine")) {
const unsigned int itemsPerLine {elem->get<unsigned int>("itemsPerLine")}; const unsigned int itemsPerLine {elem->get<unsigned int>("itemsPerLine")};
if (itemsPerLine < 1 || itemsPerLine > 10) { if (itemsPerLine < 1 || itemsPerLine > 10) {
@ -266,9 +265,6 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
mFlexboxComponent.setItemsPerLine(itemsPerLine); mFlexboxComponent.setItemsPerLine(itemsPerLine);
} }
} }
else {
mFlexboxComponent.setItemsPerLine(4);
}
if (elem->has("itemMargin")) { if (elem->has("itemMargin")) {
glm::vec2 itemMargin = elem->get<glm::vec2>("itemMargin"); glm::vec2 itemMargin = elem->get<glm::vec2>("itemMargin");