From e22c2dfcd52caf095f110309cf814565fba17e7a Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Fri, 19 May 2023 19:37:24 +0200
Subject: [PATCH] Update Flexbox.lua

Another small offset bug on very small flexbox sizes got fixed
---
 Basalt/objects/Flexbox.lua | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Basalt/objects/Flexbox.lua b/Basalt/objects/Flexbox.lua
index ca113ab..213ff6f 100644
--- a/Basalt/objects/Flexbox.lua
+++ b/Basalt/objects/Flexbox.lua
@@ -99,7 +99,7 @@ return function(name, basalt)
                     lineOffset = lineOffset + lineSize + spacing
                     lineSize = 1
                     index = index + 1
-                    sortedChildren[index] = {offset=lineOffset, v}
+                    sortedChildren[index] = {offset=lineOffset}
                 else
                     table.insert(sortedChildren[index], v)
                 end
@@ -113,13 +113,8 @@ return function(name, basalt)
             local usedSize = 0
             local index = 1
 
-            for _,v in pairs(children)do
-                if(sortedChildren[index]==nil)then sortedChildren[index]={offset=1} end
-
-                local childHeight = direction == "row" and v:getHeight() or v:getWidth()
-                if childHeight > lineSize then
-                    lineSize = childHeight
-                end
+            for _,v in pairs(children) do
+                if(sortedChildren[index]==nil) then sortedChildren[index]={offset=1} end
 
                 if v == lineBreakFakeObject then
                     lineOffset = lineOffset + lineSize + spacing
@@ -129,18 +124,24 @@ return function(name, basalt)
                     sortedChildren[index] = {offset=lineOffset}
                 else
                     local objSize = direction == "row" and v:getWidth() or v:getHeight()
-                    if(objSize+usedSize>maxSize)then
+                    if(objSize+usedSize<=maxSize) then
+                        table.insert(sortedChildren[index], v)
+                        usedSize = usedSize + objSize + spacing
+                    else
                         lineOffset = lineOffset + lineSize + spacing
                         lineSize = direction == "row" and v:getHeight() or v:getWidth()
                         index = index + 1
                         usedSize = objSize + spacing
                         sortedChildren[index] = {offset=lineOffset, v}
-                    else
-                        usedSize = usedSize + objSize + spacing
-                        table.insert(sortedChildren[index], v)
+                    end
+
+                    local childHeight = direction == "row" and v:getHeight() or v:getWidth()
+                    if childHeight > lineSize then
+                        lineSize = childHeight
                     end
                 end
             end
+
         end
     end