summaryrefslogtreecommitdiff
path: root/core/lua
diff options
context:
space:
mode:
authorAylur <[email protected]>2024-09-12 22:56:08 +0000
committerAylur <[email protected]>2024-09-12 22:56:08 +0000
commit6fce8da11ac7dad427e4594beffdf60f109768e7 (patch)
tree2c7e8894245ac60f3c2931b2c712c49d0dc2c54e /core/lua
parent3a057f53a265b2a5530ae4888fb7992cd0180c89 (diff)
fix: widget constructor assigning order
assign children first, so props that depend on them work for example Stack.shown
Diffstat (limited to 'core/lua')
-rw-r--r--core/lua/astal/widget.lua26
1 files changed, 13 insertions, 13 deletions
diff --git a/core/lua/astal/widget.lua b/core/lua/astal/widget.lua
index 2383dbb..5e74440 100644
--- a/core/lua/astal/widget.lua
+++ b/core/lua/astal/widget.lua
@@ -154,12 +154,12 @@ local function astalify(ctor)
tbl.visible = true
end
- -- filter props
+ -- collect props
local props = filter(tbl, function(_, key)
return type(key) == "string" and key ~= "setup"
end)
- -- handle on_ handlers that are strings
+ -- collect signal handlers
for prop, value in pairs(props) do
if string.sub(prop, 0, 2) == "on" and type(value) ~= "function" then
props[prop] = function()
@@ -168,7 +168,7 @@ local function astalify(ctor)
end
end
- -- handle bindings
+ -- collect bindings
for prop, value in pairs(props) do
if getmetatable(value) == Binding then
bindings[prop] = value
@@ -179,16 +179,6 @@ local function astalify(ctor)
-- construct, attach bindings, add children
local widget = ctor()
- for prop, value in pairs(props) do
- widget[prop] = value
- end
-
- for prop, binding in pairs(bindings) do
- widget.on_destroy = binding:subscribe(function(v)
- widget[prop] = v
- end)
- end
-
if getmetatable(children) == Binding then
set_children(widget, children:get())
widget.on_destroy = children:subscribe(function(v)
@@ -200,6 +190,16 @@ local function astalify(ctor)
end
end
+ for prop, binding in pairs(bindings) do
+ widget.on_destroy = binding:subscribe(function(v)
+ widget[prop] = v
+ end)
+ end
+
+ for prop, value in pairs(props) do
+ widget[prop] = value
+ end
+
if type(setup) == "function" then
setup(widget)
end