Mike/FlexLove
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

z index windowing

Browse Source
This commit is contained in:
Michael Freno
2025-09-12 19:10:48 -04:00
parent 2d9c654671
commit 4002b013f6
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
FlexLove.lua
View File

@@ -62,7 +62,7 @@ function Color:toRGBA()
return self.r, self.g, self.b, self.a return self.r, self.g, self.b, self.a
end end
local enums local enums = {}
--- @enum TextAlign --- @enum TextAlign
enums.TextAlign = { enums.TextAlign = {
@@ -127,9 +127,14 @@ function Gui.resize()
end end
function Gui.draw() function Gui.draw()
for _, win in ipairs(Gui.topWindows) do -- Sort windows by z-index before drawing
win:draw() table.sort(Gui.topWindows, function(a, b)
end return a.zIndex < b.zIndex
end)
for _, win in ipairs(Gui.topWindows) do
win:draw()
end
end end
function Gui.update(dt) function Gui.update(dt)
@@ -222,6 +227,7 @@ local FONT_CACHE = {}
---@field alignItems AlignItems -- default: start ---@field alignItems AlignItems -- default: start
---@field alignContent AlignContent -- default: start ---@field alignContent AlignContent -- default: start
---@field textSize number? ---@field textSize number?
---@field zIndex number -- default: 0
local Window = {} local Window = {}
Window.__index = Window Window.__index = Window
@@ -245,6 +251,7 @@ Window.__index = Window
---@field justifyContent JustifyContent? -- default: FLEX_START ---@field justifyContent JustifyContent? -- default: FLEX_START
---@field alignItems AlignItems? -- default: STRETCH ---@field alignItems AlignItems? -- default: STRETCH
---@field alignContent AlignContent? -- default: STRETCH ---@field alignContent AlignContent? -- default: STRETCH
---@field zIndex number? -- default: 0
local WindowProps = {} local WindowProps = {}
---@param props WindowProps ---@param props WindowProps
@@ -315,13 +322,15 @@ function Window.new(props)
self.alignContent = props.alignContent or AlignContent.STRETCH self.alignContent = props.alignContent or AlignContent.STRETCH
end end
local gw, gh = love.window.getMode() local gw, gh = love.window.getMode()
self.prevGameSize = { width = gw, height = gh } self.prevGameSize = { width = gw, height = gh }
self.zIndex = props.zIndex or 0
if not props.parent then if not props.parent then
table.insert(Gui.topWindows, self) table.insert(Gui.topWindows, self)
end end
return self return self
end end
---@return { x:number, y:number, width:number, height:number } ---@return { x:number, y:number, width:number, height:number }
@@ -621,6 +630,7 @@ end
---@field _touchPressed boolean ---@field _touchPressed boolean
---@field positioning Positioning --default: ABSOLUTE (checks parent first) ---@field positioning Positioning --default: ABSOLUTE (checks parent first)
---@field textSize number? ---@field textSize number?
---@field zIndex number -- default: 0
local Button = {} local Button = {}
Button.__index = Button Button.__index = Button
@@ -672,11 +682,13 @@ function Button.new(props)
self.textSize = props.textSize self.textSize = props.textSize
self.background = props.background or Color.new(0, 0, 0, 0) self.background = props.background or Color.new(0, 0, 0, 0)
self.positioning = props.positioning or props.parent.positioning self.positioning = props.positioning or props.parent.positioning
self.zIndex = props.zIndex or 0
self.callback = props.callback or function() end self.callback = props.callback or function() end
self._pressed = false self._pressed = false
self._touchPressed = false self._touchPressed = false
props.parent:addChild(self) props.parent:addChild(self)
return self return self
@@ -829,4 +841,4 @@ end
Gui.Button = Button Gui.Button = Button
Gui.Window = Window Gui.Window = Window
return Gui, Color, enums return { GUI = Gui, Color = Color, enums = enums }