Fixed a bug in reactive not calling the observers
Fixed a layout issue (not updating properly) added the flow layout
This commit is contained in:
Robert Jelic
193
layouts/flow.lua
Normal file
193
layouts/flow.lua
Normal file
@@ -0,0 +1,193 @@
|
||||
local flow = {}
|
||||
|
||||
--- Calculates positions for all children in a flow layout
|
||||
--- @param instance table The layout instance
|
||||
--- - container: the container to layout
|
||||
--- - options: layout options
|
||||
--- - direction: "horizontal" or "vertical" (default: "horizontal")
|
||||
--- - spacing: gap between elements (default: 0)
|
||||
--- - padding: padding around the flow (default: 0)
|
||||
--- - align: "start", "center", or "end" (default: "start")
|
||||
function flow.calculate(instance)
|
||||
local container = instance.container
|
||||
local options = instance.options or {}
|
||||
|
||||
local children = container.get("children")
|
||||
local containerWidth = container.get("width")
|
||||
local containerHeight = container.get("height")
|
||||
|
||||
local direction = options.direction or "horizontal"
|
||||
local spacing = options.spacing or 0
|
||||
local padding = options.padding or 0
|
||||
local align = options.align or "start"
|
||||
|
||||
local childCount = #children
|
||||
if childCount == 0 then
|
||||
instance._positions = {}
|
||||
return
|
||||
end
|
||||
|
||||
local positions = {}
|
||||
|
||||
if direction == "horizontal" then
|
||||
local rows = {}
|
||||
local currentRow = {}
|
||||
local currentX = padding + 1
|
||||
local currentY = padding + 1
|
||||
local maxHeightInRow = 0
|
||||
|
||||
for i, child in ipairs(children) do
|
||||
local childWidth = child.get("width")
|
||||
local childHeight = child.get("height")
|
||||
|
||||
if currentX + childWidth - 1 > containerWidth - padding and currentX > padding + 1 then
|
||||
|
||||
table.insert(rows, {
|
||||
children = currentRow,
|
||||
y = currentY,
|
||||
height = maxHeightInRow
|
||||
})
|
||||
|
||||
currentRow = {}
|
||||
currentX = padding + 1
|
||||
currentY = currentY + maxHeightInRow + spacing
|
||||
maxHeightInRow = 0
|
||||
end
|
||||
|
||||
table.insert(currentRow, {
|
||||
child = child,
|
||||
width = childWidth,
|
||||
height = childHeight
|
||||
})
|
||||
|
||||
currentX = currentX + childWidth + spacing
|
||||
maxHeightInRow = math.max(maxHeightInRow, childHeight)
|
||||
end
|
||||
|
||||
if #currentRow > 0 then
|
||||
table.insert(rows, {
|
||||
children = currentRow,
|
||||
y = currentY,
|
||||
height = maxHeightInRow
|
||||
})
|
||||
end
|
||||
|
||||
for _, row in ipairs(rows) do
|
||||
local rowWidth = 0
|
||||
for j, item in ipairs(row.children) do
|
||||
rowWidth = rowWidth + item.width
|
||||
if j < #row.children then
|
||||
rowWidth = rowWidth + spacing
|
||||
end
|
||||
end
|
||||
|
||||
local startX = padding + 1
|
||||
if align == "center" then
|
||||
startX = padding + 1 + math.floor((containerWidth - 2 * padding - rowWidth) / 2)
|
||||
elseif align == "end" then
|
||||
startX = containerWidth - padding - rowWidth + 1
|
||||
end
|
||||
|
||||
local x = startX
|
||||
for _, item in ipairs(row.children) do
|
||||
local y = row.y
|
||||
if align == "center" then
|
||||
y = row.y + math.floor((row.height - item.height) / 2)
|
||||
elseif align == "end" then
|
||||
y = row.y + row.height - item.height
|
||||
end
|
||||
|
||||
positions[item.child] = {
|
||||
x = x,
|
||||
y = y,
|
||||
width = item.width,
|
||||
height = item.height
|
||||
}
|
||||
|
||||
x = x + item.width + spacing
|
||||
end
|
||||
end
|
||||
|
||||
else
|
||||
local columns = {}
|
||||
local currentColumn = {}
|
||||
local currentX = padding + 1
|
||||
local currentY = padding + 1
|
||||
local maxWidthInColumn = 0
|
||||
|
||||
for i, child in ipairs(children) do
|
||||
local childWidth = child.get("width")
|
||||
local childHeight = child.get("height")
|
||||
|
||||
if currentY + childHeight - 1 > containerHeight - padding and currentY > padding + 1 then
|
||||
table.insert(columns, {
|
||||
children = currentColumn,
|
||||
x = currentX,
|
||||
width = maxWidthInColumn
|
||||
})
|
||||
|
||||
currentColumn = {}
|
||||
currentY = padding + 1
|
||||
currentX = currentX + maxWidthInColumn + spacing
|
||||
maxWidthInColumn = 0
|
||||
end
|
||||
|
||||
table.insert(currentColumn, {
|
||||
child = child,
|
||||
width = childWidth,
|
||||
height = childHeight
|
||||
})
|
||||
|
||||
currentY = currentY + childHeight + spacing
|
||||
maxWidthInColumn = math.max(maxWidthInColumn, childWidth)
|
||||
end
|
||||
|
||||
if #currentColumn > 0 then
|
||||
table.insert(columns, {
|
||||
children = currentColumn,
|
||||
x = currentX,
|
||||
width = maxWidthInColumn
|
||||
})
|
||||
end
|
||||
|
||||
for _, column in ipairs(columns) do
|
||||
local columnHeight = 0
|
||||
for j, item in ipairs(column.children) do
|
||||
columnHeight = columnHeight + item.height
|
||||
if j < #column.children then
|
||||
columnHeight = columnHeight + spacing
|
||||
end
|
||||
end
|
||||
|
||||
local startY = padding + 1
|
||||
if align == "center" then
|
||||
startY = padding + 1 + math.floor((containerHeight - 2 * padding - columnHeight) / 2)
|
||||
elseif align == "end" then
|
||||
startY = containerHeight - padding - columnHeight + 1
|
||||
end
|
||||
|
||||
local y = startY
|
||||
for _, item in ipairs(column.children) do
|
||||
local x = column.x
|
||||
if align == "center" then
|
||||
x = column.x + math.floor((column.width - item.width) / 2)
|
||||
elseif align == "end" then
|
||||
x = column.x + column.width - item.width
|
||||
end
|
||||
|
||||
positions[item.child] = {
|
||||
x = x,
|
||||
y = y,
|
||||
width = item.width,
|
||||
height = item.height
|
||||
}
|
||||
|
||||
y = y + item.height + spacing
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
instance._positions = positions
|
||||
end
|
||||
|
||||
return flow
|
||||
Reference in New Issue
Block a user