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

fix segfault in badge destructor

Browse source 
fix margins
This commit is contained in:
Sophia Hadash 2021-09-26 22:59:14 +02:00
parent a4d4493d3e
commit e2c1d2d0ef
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/components/BadgesComponent.cpp
View file

@ -51,8 +51,7 @@ BadgesComponent::BadgesComponent(Window *window)
} }
BadgesComponent::~BadgesComponent() { BadgesComponent::~BadgesComponent() {
mBadgeIcons.clear(); mChildren.clear();
mImageComponents.clear();
} }

4
es-core/src/components/FlexboxComponent.cpp
View file

@ -121,12 +121,12 @@ void FlexboxComponent::computeLayout()
float y = anchorY - anchorOriginY * size.y; float y = anchorY - anchorOriginY * size.y;
// Apply item margin. // Apply item margin.
if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) || /*if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
(mDirection == "column" && i >= (int) mItemsPerLine)) (mDirection == "column" && i >= (int) mItemsPerLine))
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f); x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) || if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
(mDirection == "row" && i >= (int) mItemsPerLine)) (mDirection == "row" && i >= (int) mItemsPerLine))
y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f); y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f);*/
// Apply alignment // Apply alignment
if (mAlign == ITEM_ALIGN_END) { if (mAlign == ITEM_ALIGN_END) {