allow events bound to widget classes

luigi/widget/sash.lua

@@ -2,36 +2,32 @@ local Widget = require((...):gsub('%.[^.]*$', ''))
 
 local Sash = Widget:extend()
 
-function Sash:constructor (layout, data)
-    Widget.constructor(self, layout, data)
+Sash:onPressDrag(function (event)
+    local self = event.target
+    local axis = self.parent.flow
+    if axis == 'x' then
+        dimension = 'width'
+    else
+        axis = 'y'
+        dimension = 'height'
+    end
+    local prevSibling = self:getPrevious()
+    local nextSibling = self:getNext()
+    local prevSize = prevSibling and prevSibling[dimension]
+    local nextSize = nextSibling and nextSibling[dimension]
+    if prevSize then
+        prevSibling:setDimension(dimension,
+                event[axis] - prevSibling:calculatePosition(axis))
+    end
+    if nextSize then
+        nextSibling:setDimension(dimension,
+                nextSibling:calculatePosition(axis) +
+                nextSibling[dimension] - event[axis])
+    end
 
-    self:onPressDrag(function (event)
-        local axis = self.parent.flow
-        if axis == 'x' then
-            dimension = 'width'
-        else
-            axis = 'y'
-            dimension = 'height'
-        end
-        local prevSibling = self:getPrevious()
-        local nextSibling = self:getNext()
-        local prevSize = prevSibling and prevSibling[dimension]
-        local nextSize = nextSibling and nextSibling[dimension]
-        if prevSize then
-            prevSibling:setDimension(dimension,
-                    event[axis] - prevSibling:calculatePosition(axis))
-        end
-        if nextSize then
-            nextSibling:setDimension(dimension,
-                    nextSibling:calculatePosition(axis) +
-                    nextSibling[dimension] - event[axis])
-        end
-
-        prevSibling:reflow()
-        nextSibling:reflow()
-        self:reflow()
-    end)
-
-end
+    prevSibling:reflow()
+    nextSibling:reflow()
+    self:reflow()
+end)
 
 return Sash

luigi/widget/slider.lua

@@ -6,47 +6,48 @@ function Slider:constructor (layout, data)
     Widget.constructor(self, layout, data)
 
     self.value = 0.5
-
-    self:onPressDrag(function (event)
-        local x1, y1, x2, y2 = self:getRectangle(true, true)
-        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
-    end)
-
-    self:onDisplay(function (event)
-        local x1, y1, x2, y2 = self:getRectangle(true, true)
-        local padding = self.padding or 0
-
-        local sx1 = math.floor(x1 + self.value * (x2 - x1) - padding) + 0.5
-        local sy1 = math.floor(y1 + padding) + 0.5
-        local sx2 = padding * 2
-        local sy2 = y2 - y1 - padding
-
-        love.graphics.push('all')
-
-        love.graphics.setColor(self.outline)
-
-        love.graphics.rectangle('fill',
-            x1,
-            y1 + ((y2 - y1) / 2),
-            x2 - x1,
-            padding
-        )
-
-        love.graphics.setColor(self.background)
-
-        love.graphics.rectangle('fill', sx1, sy1, sx2, sy2)
-
-        love.graphics.setColor(self.outline)
-
-        love.graphics.rectangle('line', sx1, sy1, sx2, sy2)
-
-        love.graphics.pop()
-
-        return false
-    end)
-
 end
 
+Slider:onPressDrag(function (event)
+    local self = event.target
+    local x1, y1, x2, y2 = self:getRectangle(true, true)
+    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
+end)
+
+Slider:onDisplay(function (event)
+    local self = event.target
+    local x1, y1, x2, y2 = self:getRectangle(true, true)
+    local padding = self.padding or 0
+
+    local sx1 = math.floor(x1 + self.value * (x2 - x1) - padding) + 0.5
+    local sy1 = math.floor(y1 + padding) + 0.5
+    local sx2 = padding * 2
+    local sy2 = y2 - y1 - padding
+
+    love.graphics.push('all')
+
+    love.graphics.setColor(self.outline)
+
+    love.graphics.rectangle('fill',
+        x1,
+        y1 + ((y2 - y1) / 2),
+        x2 - x1,
+        padding
+    )
+
+    love.graphics.setColor(self.background)
+
+    love.graphics.rectangle('fill', sx1, sy1, sx2, sy2)
+
+    love.graphics.setColor(self.outline)
+
+    love.graphics.rectangle('line', sx1, sy1, sx2, sy2)
+
+    love.graphics.pop()
+
+    return false
+end)
+
 return Slider