make widgets identical to their data definitions

example/main.lua

@@ -95,7 +95,7 @@ layout.leftSideBox:addChild {
 
 layout.slidey:onPressDrag(function (event)
     layout.progressBar.value = layout.slidey.value
-    layout.progressBar:reflow()
+    layout.progressBar:reshape()
 end)
 
 --[[
@@ -115,14 +115,14 @@ layout:onKeyboard(function(event)
 end)
 ]]
 
-layout:onMotion(function (event)
+layout:onMove(function (event)
     local w = event.target
     layout.statusbar.text = (w.id or '(unnamed)') .. ' ' ..
         w:getX() .. ', ' .. w:getY() .. ' | ' ..
         w:getWidth() .. 'x' .. w:getHeight()
 end)
 
-layout.newButton:onMotion(function (event)
+layout.newButton:onMove(function (event)
     layout.statusbar.text = 'Create a new thing'
     return false
 end)

luigi/event.lua

@@ -18,7 +18,7 @@ function Event:bind (target, callback)
 end
 
 local eventNames = {
-    'Reshape', 'Display', 'KeyPress', 'KeyRelease', 'TextInput', 'Motion',
+    'Reshape', 'Display', 'KeyPress', 'KeyRelease', 'TextInput', 'Move',
     'Enter', 'Leave', 'PressEnter', 'PressLeave',
     'PressStart', 'PressEnd', 'PressDrag', 'PressMove', 'Press',
 }

luigi/input.lua

@@ -69,16 +69,16 @@ function Input:handleTextInput (text, x, y)
     })
 end
 
-function Input:handleMotion (x, y)
+function Input:handleMove (x, y)
     local widget = self.layout:getWidgetAt(x, y)
-    local previousWidget = self.previousMotionWidget
+    local previousWidget = self.previousMoveWidget
     if not widget.hovered then
         if previousWidget then
             previousWidget.hovered = nil
         end
         widget.hovered = true
     end
-    self:bubbleEvent('Motion', widget, {
+    self:bubbleEvent('Move', widget, {
         target = widget,
         oldTarget = previousWidget,
         x = x, y = y
@@ -96,11 +96,11 @@ function Input:handleMotion (x, y)
             oldTarget = previousWidget,
             x = x, y = y
         })
-        self.previousMotionWidget = widget
+        self.previousMoveWidget = widget
     end
 end
 
-function Input:handlePressedMotion (x, y)
+function Input:handlePressedMove (x, y)
     local widget = self.layout:getWidgetAt(x, y)
     for button = 1, 3 do
         local originWidget = self.pressedWidgets[button]
@@ -183,7 +183,7 @@ function Input:handleReshape (width, height)
 
     root.width = width
     root.height = height
-    root:reflow()
+    root:reshape()
 end
 
 return Input

luigi/layout.lua

@@ -52,7 +52,7 @@ function Layout:show ()
         love.window.setTitle(title)
     end
     self:manageInput(self.input)
-    root:reflow()
+    root:reshape()
 end
 
 function Layout:hide ()
@@ -141,9 +141,9 @@ function Layout:manageInput (input)
     end)
     self:hook('mousemoved', function (x, y, dx, dy)
         if self.isMousePressed then
-            return input:handlePressedMotion(x, y)
+            return input:handlePressedMove(x, y)
         else
-            return input:handleMotion(x, y)
+            return input:handleMove(x, y)
         end
     end)
     self:hook('keypressed', function (key, isRepeat)

luigi/widget.lua

@@ -1,9 +1,10 @@
 local ROOT = (...):gsub('[^.]*$', '')
 
-local Base = require(ROOT .. 'base')
 local Event = require(ROOT .. 'event')
 
-local Widget = Base:extend()
+local Widget = {}
+
+Event.injectBinders(Widget)
 
 Widget.isWidget = true
 
@@ -19,46 +20,40 @@ function Widget.register (name, decorator)
     Widget.typeDecorators[name] = decorator
 end
 
-function Widget:constructor (layout, data)
-    local meta = getmetatable(self)
-    local metaIndex = meta.__index
-    self.widgetClass = metaIndex
-    self.type = 'generic'
+local function new (Widget, layout, self)
+    self = self or {}
+    self.type = self.type or 'generic'
     self.layout = layout
     self.children = {}
     self.position = { x = nil, y = nil }
     self.dimensions = { width = nil, height = nil }
-    self:extract(data)
+
+    local meta = setmetatable(self, {
+        __index = function (self, property)
+            local value = Widget[property]
+            if value ~= nil then return value end
+            local style = self.layout.style
+            value = style and style:getProperty(self, property)
+            if value ~= nil then return value end
+            local theme = self.layout.theme
+            return theme and theme:getProperty(self, property)
+        end
+    })
+
     layout:addWidget(self)
-    local widget = self
-    function meta:__index(property)
-        local value = metaIndex[property]
-        if value ~= nil then return value end
-        local style = widget.layout.style
-        value = style and style:getProperty(self, property)
-        if value ~= nil then return value end
-        local theme = widget.layout.theme
-        return theme and theme:getProperty(self, property)
+
+    for k, v in ipairs(self) do
+        self.children[k] = v.isWidget and v or new(Widget, self.layout, v)
+        self.children[k].parent = self
     end
 
-    local decorate = self.type and Widget.typeDecorators[self.type]
+    local decorate = Widget.typeDecorators[self.type]
 
     if decorate then
-        decorate(widget)
+        decorate(self)
     end
-end
 
-function Widget:extract (data)
-    local children = self.children
-    -- TODO: get rid of pairs somehow
-    for k, v in pairs(data) do
-        if type(k) == 'number' then
-            children[k] = v.isWidget and v or Widget(self.layout, v)
-            children[k].parent = self
-        else
-            self[k] = v
-        end
-    end
+    return self
 end
 
 function Widget:getPrevious ()
@@ -251,18 +246,16 @@ function Widget:getAncestors (includeSelf)
     end
 end
 
--- Reflow the widget. Call this after changing position/dimensions.
-function Widget:reflow ()
+-- reshape the widget. Call this after changing position/dimensions.
+function Widget:reshape ()
     self.position = {}
     self.dimensions = {}
     Event.Reshape:emit(self, {
         target = self
     })
     for i, widget in ipairs(self.children) do
-        widget:reflow()
+        widget:reshape()
     end
 end
 
-Event.injectBinders(Widget)
-
-return Widget
+return setmetatable(Widget, { __call = new })

luigi/widget/sash.lua

@@ -22,9 +22,9 @@ return function (self)
                     nextSibling[dimension] - event[axis])
         end
 
-        prevSibling:reflow()
-        nextSibling:reflow()
-        self:reflow()
+        prevSibling:reshape()
+        nextSibling:reshape()
+        self:reshape()
     end)
 
 end

luigi/widget/slider.lua

@@ -24,7 +24,7 @@ return function (self)
         self.value = (event.x - x1) / (x2 - x1)
         if self.value < 0 then self.value = 0 end
         if self.value > 1 then self.value = 1 end
-        self:reflow()
+        self:reshape()
     end
 
     self:onPressStart(press)