justifySelf
This commit is contained in:
Michael Freno
250
FlexLove.lua
250
FlexLove.lua
@@ -582,95 +582,183 @@ function Element:layoutChildren()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Position children
|
-- Position children
|
||||||
local currentPos = spacing
|
local currentPos = spacing
|
||||||
for _, child in ipairs(self.children) do
|
for _, child in ipairs(self.children) do
|
||||||
if child.positioning == Positioning.ABSOLUTE then
|
if child.positioning == Positioning.ABSOLUTE then
|
||||||
-- Skip positioning for absolute children as they should maintain their own coordinates
|
-- Skip positioning for absolute children as they should maintain their own coordinates
|
||||||
goto continue
|
goto continue
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.flexDirection == FlexDirection.VERTICAL then
|
if self.flexDirection == FlexDirection.VERTICAL then
|
||||||
-- Position relative to parent origin
|
-- Position relative to parent origin
|
||||||
child.x = self.x + (self.margin.left or 0)
|
child.x = self.x + (self.margin.left or 0)
|
||||||
child.y = self.y + currentPos
|
child.y = self.y + currentPos
|
||||||
|
|
||||||
-- Apply alignment to vertical axis (alignItems)
|
-- Apply alignment to vertical axis (alignItems)
|
||||||
if self.alignItems == AlignItems.FLEX_START then
|
if self.alignItems == AlignItems.FLEX_START then
|
||||||
-- nothing
|
-- nothing
|
||||||
elseif self.alignItems == AlignItems.CENTER then
|
elseif self.alignItems == AlignItems.CENTER then
|
||||||
child.x = self.x + (self.width - (child.width or 0)) / 2
|
child.x = self.x + (self.width - (child.width or 0)) / 2
|
||||||
elseif self.alignItems == AlignItems.FLEX_END then
|
elseif self.alignItems == AlignItems.FLEX_END then
|
||||||
child.x = self.x + self.width - (child.width or 0)
|
child.x = self.x + self.width - (child.width or 0)
|
||||||
elseif self.alignItems == AlignItems.STRETCH then
|
elseif self.alignItems == AlignItems.STRETCH then
|
||||||
child.width = self.width
|
child.width = self.width
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Apply self alignment to cross axis (alignSelf)
|
-- Apply self alignment to cross axis (alignSelf)
|
||||||
local effectiveAlignSelf = child.alignSelf
|
local effectiveAlignSelf = child.alignSelf
|
||||||
if child.alignSelf == AlignSelf.AUTO then
|
if child.alignSelf == AlignSelf.AUTO then
|
||||||
effectiveAlignSelf = self.alignItems
|
effectiveAlignSelf = self.alignItems
|
||||||
end
|
end
|
||||||
|
|
||||||
if effectiveAlignSelf == AlignSelf.FLEX_START then
|
if effectiveAlignSelf == AlignSelf.FLEX_START then
|
||||||
-- Position at the start of cross axis relative to parent
|
-- Position at the start of cross axis relative to parent
|
||||||
child.x = self.x + (self.margin.left or 0)
|
child.x = self.x + (self.margin.left or 0)
|
||||||
elseif effectiveAlignSelf == AlignSelf.CENTER then
|
elseif effectiveAlignSelf == AlignSelf.CENTER then
|
||||||
if self.flexDirection == FlexDirection.VERTICAL then
|
if self.flexDirection == FlexDirection.VERTICAL then
|
||||||
child.x = self.x + (self.width - (child.width or 0)) / 2
|
child.x = self.x + (self.width - (child.width or 0)) / 2
|
||||||
else
|
else
|
||||||
child.y = self.y + (self.height - (child.height or 0)) / 2
|
child.y = self.y + (self.height - (child.height or 0)) / 2
|
||||||
end
|
end
|
||||||
elseif effectiveAlignSelf == AlignSelf.FLEX_END then
|
elseif effectiveAlignSelf == AlignSelf.FLEX_END then
|
||||||
if self.flexDirection == FlexDirection.VERTICAL then
|
if self.flexDirection == FlexDirection.VERTICAL then
|
||||||
child.x = self.x + self.width - (child.width or 0)
|
child.x = self.x + self.width - (child.width or 0)
|
||||||
else
|
else
|
||||||
child.y = self.y + self.height - (child.height or 0)
|
child.y = self.y + self.height - (child.height or 0)
|
||||||
end
|
end
|
||||||
elseif effectiveAlignSelf == AlignSelf.STRETCH then
|
elseif effectiveAlignSelf == AlignSelf.STRETCH then
|
||||||
if self.flexDirection == FlexDirection.VERTICAL then
|
if self.flexDirection == FlexDirection.VERTICAL then
|
||||||
-- Only set width if not already stretched by alignItems
|
-- Only set width if not already stretched by alignItems
|
||||||
if child.width ~= self.width then
|
if child.width ~= self.width then
|
||||||
child.width = self.width
|
child.width = self.width
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- Only set height if not already stretched by alignItems
|
-- Only set height if not already stretched by alignItems
|
||||||
if child.height ~= self.height then
|
if child.height ~= self.height then
|
||||||
child.height = self.height
|
child.height = self.height
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
currentPos = currentPos + (child.height or 0) + self.gap + (self.margin.top or 0) + (self.margin.bottom or 0)
|
-- Apply justifySelf alignment to main axis (for vertical flexDirection, this is y-axis)
|
||||||
else
|
local effectiveJustifySelf = child.justifySelf
|
||||||
-- Horizontal layout: position relative to parent origin
|
if child.justifySelf == JustifySelf.AUTO then
|
||||||
child.x = self.x + currentPos + (self.margin.left or 0)
|
effectiveJustifySelf = self.justifyContent
|
||||||
child.y = self.y + (self.margin.top or 0)
|
end
|
||||||
|
|
||||||
-- Determine effective alignment - alignSelf takes precedence over alignItems
|
if effectiveJustifySelf == JustifySelf.FLEX_START then
|
||||||
local effectiveAlign = child.alignSelf
|
-- Keep the current Y position (already set by spacing logic)
|
||||||
if effectiveAlign == AlignSelf.AUTO then
|
elseif effectiveJustifySelf == JustifySelf.CENTER then
|
||||||
effectiveAlign = self.alignItems
|
-- Center along the main axis (y-axis for vertical flex direction)
|
||||||
end
|
local childHeight = child.height or 0
|
||||||
|
local availableSpace = self.height - (self.margin.top or 0) - (self.margin.bottom or 0)
|
||||||
|
local totalChildHeight = 0
|
||||||
|
for _, c in ipairs(self.children) do
|
||||||
|
if c.positioning ~= Positioning.ABSOLUTE then
|
||||||
|
totalChildHeight = totalChildHeight + (c.height or 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local freeSpace = availableSpace - totalChildHeight - (self.gap * (#self.children - 1))
|
||||||
|
if freeSpace > 0 then
|
||||||
|
child.y = self.y + (self.margin.top or 0) + freeSpace / 2
|
||||||
|
end
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.FLEX_END then
|
||||||
|
-- Position at the end of main axis (y-axis for vertical flex direction)
|
||||||
|
local childHeight = child.height or 0
|
||||||
|
local availableSpace = self.height - (self.margin.top or 0) - (self.margin.bottom or 0)
|
||||||
|
local totalChildHeight = 0
|
||||||
|
for _, c in ipairs(self.children) do
|
||||||
|
if c.positioning ~= Positioning.ABSOLUTE then
|
||||||
|
totalChildHeight = totalChildHeight + (c.height or 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local freeSpace = availableSpace - totalChildHeight - (self.gap * (#self.children - 1))
|
||||||
|
if freeSpace > 0 then
|
||||||
|
child.y = self.y + (self.margin.top or 0) + freeSpace
|
||||||
|
end
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_AROUND then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_EVENLY then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_BETWEEN then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
end
|
||||||
|
|
||||||
-- Apply alignment
|
currentPos = currentPos + (child.height or 0) + self.gap + (self.margin.top or 0) + (self.margin.bottom or 0)
|
||||||
if effectiveAlign == AlignItems.FLEX_START then
|
else
|
||||||
-- Keep the margin.top position (already applied)
|
-- Horizontal layout: position relative to parent origin
|
||||||
elseif effectiveAlign == AlignItems.CENTER then
|
child.x = self.x + currentPos + (self.margin.left or 0)
|
||||||
child.y = self.y + (self.height - (child.height or 0)) / 2
|
child.y = self.y + (self.margin.top or 0)
|
||||||
elseif effectiveAlign == AlignItems.FLEX_END then
|
|
||||||
child.y = self.y + self.height - (child.height or 0)
|
|
||||||
elseif effectiveAlign == AlignItems.STRETCH then
|
|
||||||
-- Only set height if not already stretched
|
|
||||||
if child.height ~= self.height then
|
|
||||||
child.height = self.height
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
currentPos = currentPos + (child.width or 0) + self.gap + (self.margin.left or 0) + (self.margin.right or 0)
|
-- Determine effective alignment - alignSelf takes precedence over alignItems
|
||||||
end
|
local effectiveAlign = child.alignSelf
|
||||||
::continue::
|
if effectiveAlign == AlignSelf.AUTO then
|
||||||
end
|
effectiveAlign = self.alignItems
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Apply alignment
|
||||||
|
if effectiveAlign == AlignItems.FLEX_START then
|
||||||
|
-- Keep the margin.top position (already applied)
|
||||||
|
elseif effectiveAlign == AlignItems.CENTER then
|
||||||
|
child.y = self.y + (self.height - (child.height or 0)) / 2
|
||||||
|
elseif effectiveAlign == AlignItems.FLEX_END then
|
||||||
|
child.y = self.y + self.height - (child.height or 0)
|
||||||
|
elseif effectiveAlign == AlignItems.STRETCH then
|
||||||
|
-- Only set height if not already stretched
|
||||||
|
if child.height ~= self.height then
|
||||||
|
child.height = self.height
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Apply justifySelf alignment to main axis (for horizontal flexDirection, this is x-axis)
|
||||||
|
local effectiveJustifySelf = child.justifySelf
|
||||||
|
if child.justifySelf == JustifySelf.AUTO then
|
||||||
|
effectiveJustifySelf = self.justifyContent
|
||||||
|
end
|
||||||
|
|
||||||
|
if effectiveJustifySelf == JustifySelf.FLEX_START then
|
||||||
|
-- Keep the current X position (already set by spacing logic)
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.CENTER then
|
||||||
|
-- Center along the main axis (x-axis for horizontal flex direction)
|
||||||
|
local childWidth = child.width or 0
|
||||||
|
local availableSpace = self.width - (self.margin.left or 0) - (self.margin.right or 0)
|
||||||
|
local totalChildWidth = 0
|
||||||
|
for _, c in ipairs(self.children) do
|
||||||
|
if c.positioning ~= Positioning.ABSOLUTE then
|
||||||
|
totalChildWidth = totalChildWidth + (c.width or 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local freeSpace = availableSpace - totalChildWidth - (self.gap * (#self.children - 1))
|
||||||
|
if freeSpace > 0 then
|
||||||
|
child.x = self.x + (self.margin.left or 0) + freeSpace / 2
|
||||||
|
end
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.FLEX_END then
|
||||||
|
-- Position at the end of main axis (x-axis for horizontal flex direction)
|
||||||
|
local childWidth = child.width or 0
|
||||||
|
local availableSpace = self.width - (self.margin.left or 0) - (self.margin.right or 0)
|
||||||
|
local totalChildWidth = 0
|
||||||
|
for _, c in ipairs(self.children) do
|
||||||
|
if c.positioning ~= Positioning.ABSOLUTE then
|
||||||
|
totalChildWidth = totalChildWidth + (c.width or 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local freeSpace = availableSpace - totalChildWidth - (self.gap * (#self.children - 1))
|
||||||
|
if freeSpace > 0 then
|
||||||
|
child.x = self.x + (self.margin.left or 0) + freeSpace
|
||||||
|
end
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_AROUND then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_EVENLY then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
elseif effectiveJustifySelf == JustifySelf.SPACE_BETWEEN then
|
||||||
|
-- This would be handled by the justifyContent logic already, so we'll keep existing behavior
|
||||||
|
end
|
||||||
|
|
||||||
|
currentPos = currentPos + (child.width or 0) + self.gap + (self.margin.left or 0) + (self.margin.right or 0)
|
||||||
|
end
|
||||||
|
::continue::
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Destroy element and its children
|
--- Destroy element and its children
|
||||||
|
|||||||
Reference in New Issue
Block a user