Simplify event handling
This commit is contained in:
parent
df8f9d4018
commit
8232f116a5
@ -18,8 +18,8 @@ end
|
||||
|
||||
function Event.containsClick(element, evt, dX, dY)
|
||||
local x, y = Event.getClickParams(evt)
|
||||
x = x + dX
|
||||
y = y + dY
|
||||
x = x + (dX or 0)
|
||||
y = y + (dY or 0)
|
||||
local eX, eY = element:getPos()
|
||||
return x >= eX and x < (eX + element:getWidth()) and y >= eY and y < (eY + element:getHeight())
|
||||
end
|
||||
|
@ -133,7 +133,7 @@ function List:handleEvent(evt)
|
||||
|
||||
if Event.isClickEvent(evt) then
|
||||
-- If click is not inside list bounds, we can safely ignore it
|
||||
if not Event.containsClick(self, evt, 0, 0) then
|
||||
if not Event.containsClick(self, evt) then
|
||||
return false
|
||||
end
|
||||
|
||||
|
@ -86,7 +86,7 @@ function Padding:handleEvent(evt)
|
||||
end
|
||||
|
||||
if Event.isClickEvent(evt) then
|
||||
return self.element:handleEvent({Event.repositionEvent(evt, -self:getPaddingLeft(), -self:getPaddingTop())})
|
||||
return Event.containsClick(self, evt) and self.element:handleEvent({Event.repositionEvent(evt, -self:getPaddingLeft(), -self:getPaddingTop())})
|
||||
else
|
||||
return self.element:handleEvent(evt)
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user