summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/astal/binding.lua2
-rw-r--r--lua/astal/widget.lua13
2 files changed, 9 insertions, 6 deletions
diff --git a/lua/astal/binding.lua b/lua/astal/binding.lua
index c9929ea..50509d1 100644
--- a/lua/astal/binding.lua
+++ b/lua/astal/binding.lua
@@ -21,7 +21,7 @@ function Binding.new(emitter, property)
end
function Binding:__tostring()
- local str = "Binding<" .. tostring(self:get())
+ local str = "Binding<" .. tostring(self.emitter)
if self.property ~= nil then
str = str .. ", " .. self.property
end
diff --git a/lua/astal/widget.lua b/lua/astal/widget.lua
index 8cbb9b9..f9a7800 100644
--- a/lua/astal/widget.lua
+++ b/lua/astal/widget.lua
@@ -83,12 +83,15 @@ local function set_children(parent, children)
end
local function merge_bindings(array)
- local function get_values()
- return map(array, function(v)
- if getmetatable(v) == Binding then
- return v:get()
+ local function get_values(...)
+ local args = { ... }
+ local i = 0
+ return map(array, function(value)
+ if getmetatable(value) == Binding then
+ i = i + 1
+ return args[i]
else
- return v
+ return value
end
end)
end