GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Update Flexbox.lua

Browse Source 
Fixed dynamic values not working
This commit is contained in:
Robert Jelic
2023-05-22 17:28:17 +02:00
parent 42972f3c2c
commit 4feeaa7942
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Basalt/objects/Flexbox.lua
View File

@@ -34,15 +34,15 @@ local function flexObjectPlugin(base, basalt)
return self return self
end, end,
getSize = function(self) getBaseSize = function(self)
return baseWidth, baseHeight return baseWidth, baseHeight
end, end,
getWidth = function(self) getBaseWidth = function(self)
return baseWidth return baseWidth
end, end,
getHeight = function(self) getBaseHeight = function(self)
return baseHeight return baseHeight
end, end,
@@ -71,8 +71,8 @@ return function(name, basalt)
local sortedChildren = {} local sortedChildren = {}
local updateLayout = false local updateLayout = false
local lineBreakFakeObject = flexObjectPlugin({ local lineBreakFakeObject = flexObjectPlugin({
getHeight = function(self) return 0 end, getBaseHeight = function(self) return 0 end,
getWidth = function(self) return 0 end, getBaseWidth = function(self) return 0 end,
getPosition = function(self) return 0, 0 end, getPosition = function(self) return 0, 0 end,
getSize = function(self) return 0, 0 end, getSize = function(self) return 0, 0 end,
isType = function(self) return false end, isType = function(self) return false end,
@@ -123,19 +123,19 @@ return function(name, basalt)
index = index + 1 index = index + 1
sortedChildren[index] = {offset=lineOffset} sortedChildren[index] = {offset=lineOffset}
else else
local objSize = direction == "row" and v:getWidth() or v:getHeight() local objSize = direction == "row" and v:getBaseWidth() or v:getBaseHeight()
if(objSize+usedSize<=maxSize) then if(objSize+usedSize<=maxSize) then
table.insert(sortedChildren[index], v) table.insert(sortedChildren[index], v)
usedSize = usedSize + objSize + spacing usedSize = usedSize + objSize + spacing
else else
lineOffset = lineOffset + lineSize + spacing lineOffset = lineOffset + lineSize + spacing
lineSize = direction == "row" and v:getHeight() or v:getWidth() lineSize = direction == "row" and v:getBaseHeight() or v:getBaseWidth()
index = index + 1 index = index + 1
usedSize = objSize + spacing usedSize = objSize + spacing
sortedChildren[index] = {offset=lineOffset, v} sortedChildren[index] = {offset=lineOffset, v}
end end
local childHeight = direction == "row" and v:getHeight() or v:getWidth() local childHeight = direction == "row" and v:getBaseHeight() or v:getBaseWidth()
if childHeight > lineSize then if childHeight > lineSize then
lineSize = childHeight lineSize = childHeight
end end
@@ -166,7 +166,7 @@ return function(name, basalt)
local flexGrow = child:getFlexGrow() local flexGrow = child:getFlexGrow()
local flexShrink = child:getFlexShrink() local flexShrink = child:getFlexShrink()
local baseWidth = child:getFlexBasis() ~= 0 and child:getFlexBasis() or child:getWidth() local baseWidth = child:getFlexBasis() ~= 0 and child:getFlexBasis() or child:getBaseWidth()
if totalFlexGrow > 0 then if totalFlexGrow > 0 then
childWidth = baseWidth + flexGrow / totalFlexGrow * remainingSpace childWidth = baseWidth + flexGrow / totalFlexGrow * remainingSpace
else else
@@ -255,7 +255,7 @@ return function(name, basalt)
local flexGrow = child:getFlexGrow() local flexGrow = child:getFlexGrow()
local flexShrink = child:getFlexShrink() local flexShrink = child:getFlexShrink()
local baseHeight = child:getFlexBasis() ~= 0 and child:getFlexBasis() or child:getHeight() local baseHeight = child:getFlexBasis() ~= 0 and child:getFlexBasis() or child:getBaseHeight()
if totalFlexGrow > 0 then if totalFlexGrow > 0 then
childHeight = baseHeight + flexGrow / totalFlexGrow * remainingSpace childHeight = baseHeight + flexGrow / totalFlexGrow * remainingSpace
else else