Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-31 04:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove flexbox padding when item margins are set

Browse source
This commit is contained in:
Sophia Hadash 2021-09-26 02:17:07 +02:00
parent c08bdda008
commit 97067ae40b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ void FlexboxComponent::computeLayout()
float anchorYStart = anchorY; float anchorYStart = anchorY;
// Compute total container size. // Compute total container size.
glm::vec2 totalSize = {mItemMargin.x, mItemMargin.y}; glm::vec2 totalSize = {-mItemMargin.x, -mItemMargin.y};
if (mDirection == "row") { if (mDirection == "row") {
totalSize.x += (mItemMargin.x + mItemWidth) * mItemsPerLine; totalSize.x += (mItemMargin.x + mItemWidth) * mItemsPerLine;
totalSize.y += (mItemMargin.y + maxItemSize.y) * nLines; totalSize.y += (mItemMargin.y + maxItemSize.y) * nLines;
@ -121,8 +121,12 @@ void FlexboxComponent::computeLayout()
float y = anchorY - anchorOriginY * size.y; float y = anchorY - anchorOriginY * size.y;
// Apply item margin. // Apply item margin.
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f); if ((mDirection == "row" && i % std::max(1, (int) mItemsPerLine) != 0) ||
y += mItemMargin.y * (directionLine.y >= 0.0f ? 1.0f : -1.0f); (mDirection == "column" && i >= (int) mItemsPerLine))
x += mItemMargin.x * (directionLine.x >= 0.0f ? 1.0f : -1.0f);
if ((mDirection == "column" && i % std::max(1, (int) mItemsPerLine) != 0) ||
(mDirection == "row" && i >= (int) mItemsPerLine))
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) {