Mike/FlexLove
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

callback renamed -> onEvent

Browse Source
This commit is contained in:
Michael Freno
2025-11-11 13:13:22 -05:00
parent e56b18b7bd
commit be0771d0d3
15 changed files with 80 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlexLove.lua
View File

@@ -384,8 +384,8 @@ function Gui.getElementAtPosition(x, y)
local adjustedY = y + scrollOffsetY local adjustedY = y + scrollOffsetY
if adjustedX >= bx and adjustedX <= bx + bw and adjustedY >= by and adjustedY <= by + bh then if adjustedX >= bx and adjustedX <= bx + bw and adjustedY >= by and adjustedY <= by + bh then
-- Collect interactive elements (those with callbacks) -- Collect interactive elements (those with onEvent handlers)
if element.callback and not element.disabled then if element.onEvent and not element.disabled then
table.insert(candidates, element) table.insert(candidates, element)
end end

25
README.md
View File

@@ -58,7 +58,7 @@ local button = FlexLove.Element.new({
text = "Click Me", text = "Click Me",
textSize = "md", textSize = "md",
themeComponent = "button", themeComponent = "button",
callback = function(element, event) onEvent = function(element, event)
print("Button clicked!") print("Button clicked!")
end end
}) })
@@ -105,14 +105,25 @@ local someGameState = true
local button1 = FlexLove.Element.new({ local button1 = FlexLove.Element.new({
text = "Button 1", text = "Button 1",
disabled = someGameState, disabled = someGameState,
callback = function() print("Clicked!") end onEvent = function() print("Clicked!") end
}) })
-- ... other things ... -- -- ... other things ... --
local someGameState = false -- button1 will not change its disabled state, you need a way to update the element local someGameState = false -- button1 will not change its disabled state, you need a way to update the element
local button2 = FlexLove.Element.new({ local button2 = FlexLove.Element.new({
text = "Click to activate button 1", text = "Click to activate button 1",
callback = function(_, event) onEvent = function(_, event)
if event.type == "release" then -- only fire on mouse release
button1.disabled = false -- this will actual update the element
end
end
})
-- ... other things ... --
local someGameState = false -- button1 will not change its disabled state, you need a way to update the element
local button2 = FlexLove.Element.new({
text = "Click to activate button 1",
onEvent = function(_, event)
if event.type == "release" then -- only fire on mouse release if event.type == "release" then -- only fire on mouse release
button1.disabled = false -- this will actual update the element button1.disabled = false -- this will actual update the element
end end
@@ -137,14 +148,14 @@ local someGameState = true
local button1 = FlexLove.Element.new({ local button1 = FlexLove.Element.new({
text = "Button 1", text = "Button 1",
disabled = someGameState, disabled = someGameState,
callback = function() print("Clicked!") end onEvent = function() print("Clicked!") end
}) })
-- ... other things ... -- -- ... other things ... --
local someGameState = false -- button1 in immediate mode will have its state updated local someGameState = false -- button1 in immediate mode will have its state updated
local button2 = FlexLove.Element.new({ local button2 = FlexLove.Element.new({
text = "Click to activate button 1", text = "Click to activate button 1",
callback = function(_, event) onEvent = function(_, event)
if event.type == "release" then -- only fire on mouse release if event.type == "release" then -- only fire on mouse release
button1.disabled = false -- this will also update the element button1.disabled = false -- this will also update the element
end end
@@ -211,7 +222,7 @@ Common properties for all elements:
themeComponent = "button", -- Component type from theme themeComponent = "button", -- Component type from theme
-- Interaction -- Interaction
callback = function(element, event) end, onEvent = function(element, event) end,
disabled = false, disabled = false,
disableHighlight = false, -- Disable pressed overlay (auto-true for themed elements) disableHighlight = false, -- Disable pressed overlay (auto-true for themed elements)
@@ -351,7 +362,7 @@ Themes support state-based rendering:
Enhanced event handling with detailed event information: Enhanced event handling with detailed event information:
```lua ```lua
callback = function(element, event) onEvent = function(element, event)
-- event.type: "click", "press", "release", "rightclick", "middleclick" -- event.type: "click", "press", "release", "rightclick", "middleclick"
-- event.button: 1 (left), 2 (right), 3 (middle) -- event.button: 1 (left), 2 (right), 3 (middle)
-- event.x, event.y: Mouse position -- event.x, event.y: Mouse position

8
examples/03_theming_system.lua
View File

@@ -119,7 +119,7 @@ function Lv.load()
textSize = "2vh", textSize = "2vh",
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
print("Normal button clicked!") print("Normal button clicked!")
end end
@@ -139,7 +139,7 @@ function Lv.load()
textColor = Color.new(0.3, 1, 0.3, 1), textColor = Color.new(0.3, 1, 0.3, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
active = true, active = true,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
element.active = not element.active element.active = not element.active
print("Active button toggled:", element.active) print("Active button toggled:", element.active)
@@ -160,7 +160,7 @@ function Lv.load()
textColor = Color.new(0.5, 0.5, 0.5, 1), textColor = Color.new(0.5, 0.5, 0.5, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
disabled = true, disabled = true,
callback = function(element, event) onEvent = function(element, event)
-- This won't be called because button is disabled -- This won't be called because button is disabled
print("This shouldn't print!") print("This shouldn't print!")
end, end,
@@ -179,7 +179,7 @@ function Lv.load()
textSize = "2vh", textSize = "2vh",
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
clickCount = clickCount + 1 clickCount = clickCount + 1
element.text = "Click Me! (" .. clickCount .. ")" element.text = "Click Me! (" .. clickCount .. ")"

6
examples/05_animations.lua
View File

@@ -63,7 +63,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 10, cornerRadius = 10,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
-- Fade out then fade in -- Fade out then fade in
local fadeOut = Animation.fade(1.0, 1.0, 0.0) local fadeOut = Animation.fade(1.0, 1.0, 0.0)
@@ -109,7 +109,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 10, cornerRadius = 10,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
-- Scale up -- Scale up
local scaleUp = Animation.scale( local scaleUp = Animation.scale(
@@ -193,7 +193,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 8, cornerRadius = 8,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
-- Fade out and in with this easing -- Fade out and in with this easing
local fadeOut = Animation.fade(0.8, 1.0, 0.2) local fadeOut = Animation.fade(0.8, 1.0, 0.2)

12
examples/06_event_system.lua
View File

@@ -71,7 +71,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 10, cornerRadius = 10,
callback = function(element, event) onEvent = function(element, event)
local buttonName = event.button == 1 and "Left" or (event.button == 2 and "Right" or "Middle") local buttonName = event.button == 1 and "Left" or (event.button == 2 and "Right" or "Middle")
local eventTypeName = event.type:sub(1,1):upper() .. event.type:sub(2) local eventTypeName = event.type:sub(1,1):upper() .. event.type:sub(2)
@@ -113,7 +113,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 10, cornerRadius = 10,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
local mods = {} local mods = {}
if event.modifiers.shift then table.insert(mods, "Shift") end if event.modifiers.shift then table.insert(mods, "Shift") end
@@ -152,7 +152,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 10, cornerRadius = 10,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
if event.clickCount == 1 then if event.clickCount == 1 then
addLogEntry("Single click detected") addLogEntry("Single click detected")
@@ -237,7 +237,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 5, cornerRadius = 5,
callback = function(element, event) onEvent = function(element, event)
if event.type == "press" then if event.type == "press" then
addLogEntry("Button 1: PRESSED") addLogEntry("Button 1: PRESSED")
element.backgroundColor = Color.new(0.2, 0.3, 0.6, 1) element.backgroundColor = Color.new(0.2, 0.3, 0.6, 1)
@@ -259,7 +259,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 5, cornerRadius = 5,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
clickCounter = clickCounter + 1 clickCounter = clickCounter + 1
element.text = "Click Counter: " .. clickCounter element.text = "Click Counter: " .. clickCounter
@@ -278,7 +278,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 5, cornerRadius = 5,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
eventLog = {} eventLog = {}
addLogEntry("Log cleared!") addLogEntry("Log cleared!")

6
examples/11_input_controls.lua
View File

@@ -72,7 +72,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 8, cornerRadius = 8,
callback = function() onEvent = function()
counter = counter + 1 counter = counter + 1
counterDisplay.text = "Counter: " .. counter counterDisplay.text = "Counter: " .. counter
end end
@@ -90,7 +90,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 8, cornerRadius = 8,
callback = function() onEvent = function()
counter = counter - 1 counter = counter - 1
counterDisplay.text = "Counter: " .. counter counterDisplay.text = "Counter: " .. counter
end end
@@ -108,7 +108,7 @@ function Lv.load()
textColor = Color.new(1, 1, 1, 1), textColor = Color.new(1, 1, 1, 1),
textAlign = enums.TextAlign.CENTER, textAlign = enums.TextAlign.CENTER,
cornerRadius = 8, cornerRadius = 8,
callback = function() onEvent = function()
counter = 0 counter = 0
counterDisplay.text = "Counter: " .. counter counterDisplay.text = "Counter: " .. counter
end end

2
examples/12_z_index_layering.lua
View File

@@ -166,7 +166,7 @@ function Lv.load()
}) })
-- Add click handler to bring to front -- Add click handler to bring to front
box.callback = function(element) box.onEvent = function(element)
maxZ = maxZ + 1 maxZ = maxZ + 1
element.z = maxZ element.z = maxZ
element.text = "Box " .. i .. "\nZ: " .. element.z element.text = "Box " .. i .. "\nZ: " .. element.z

2
examples/13_comprehensive_demo.lua
View File

@@ -249,7 +249,7 @@ function Lv.load()
}) })
-- Add hover animation -- Add hover animation
card.callback = function(element) card.onEvent = function(element)
local anim = Animation.new({ local anim = Animation.new({
duration = 0.2, duration = 0.2,
start = { opacity = 1 }, start = { opacity = 1 },

2
examples/14_drag_slider.lua
View File

@@ -99,7 +99,7 @@ local function createSlider(x, y, width, label, min, max, initialValue, onValueC
}) })
-- Make the background track interactive -- Make the background track interactive
sliderBg.callback = function(element, event) sliderBg.onEvent = function(element, event)
if event.type == "press" or event.type == "drag" then if event.type == "press" or event.type == "drag" then
-- Get element bounds -- Get element bounds
local bg_x = element.x local bg_x = element.x

38
modules/Element.lua
View File

@@ -114,7 +114,7 @@ Public API methods to access internal state:
---@field autoScaleText boolean -- Whether text should auto-scale with window size (default: true) ---@field autoScaleText boolean -- Whether text should auto-scale with window size (default: true)
---@field transform TransformProps -- Transform properties for animations and styling ---@field transform TransformProps -- Transform properties for animations and styling
---@field transition TransitionProps -- Transition settings for animations ---@field transition TransitionProps -- Transition settings for animations
---@field callback fun(element:Element, event:InputEvent)? -- Callback function for interaction events ---@field onEvent fun(element:Element, event:InputEvent)? -- Callback function for interaction events
---@field units table -- Original unit specifications for responsive behavior ---@field units table -- Original unit specifications for responsive behavior
---@field _pressed table<number, boolean> -- Track pressed state per mouse button ---@field _pressed table<number, boolean> -- Track pressed state per mouse button
---@field _lastClickTime number? -- Timestamp of last click for double-click detection ---@field _lastClickTime number? -- Timestamp of last click for double-click detection
@@ -189,7 +189,7 @@ Element.__index = Element
function Element.new(props) function Element.new(props)
local self = setmetatable({}, Element) local self = setmetatable({}, Element)
self.children = {} self.children = {}
self.callback = props.callback self.onEvent = props.onEvent
-- Auto-generate ID in immediate mode if not provided -- Auto-generate ID in immediate mode if not provided
if Gui._immediateMode and (not props.id or props.id == "") then if Gui._immediateMode and (not props.id or props.id == "") then
@@ -2503,7 +2503,7 @@ function Element:destroy()
self.animation = nil self.animation = nil
-- Clear callback to prevent closure leaks -- Clear callback to prevent closure leaks
self.callback = nil self.onEvent = nil
end end
--- Draw element and its children --- Draw element and its children
@@ -2911,8 +2911,8 @@ function Element:draw(backdropCanvas)
end end
end end
-- Draw visual feedback when element is pressed (if it has a callback and highlight is not disabled) -- Draw visual feedback when element is pressed (if it has an onEvent handler and highlight is not disabled)
if self.callback and not self.disableHighlight then if self.onEvent and not self.disableHighlight then
-- Check if any button is pressed -- Check if any button is pressed
local anyPressed = false local anyPressed = false
for _, pressed in pairs(self._pressed) do for _, pressed in pairs(self._pressed) do
@@ -3173,7 +3173,7 @@ function Element:update(dt)
end end
end end
if self.callback or self.themeComponent or self.editable then if self.onEvent or self.themeComponent or self.editable then
-- Clickable area is the border box (x, y already includes padding) -- Clickable area is the border box (x, y already includes padding)
-- BORDER-BOX MODEL: Use stored border-box dimensions for hit detection -- BORDER-BOX MODEL: Use stored border-box dimensions for hit detection
local bx = self.x local bx = self.x
@@ -3269,7 +3269,7 @@ function Element:update(dt)
self._themeState = newThemeState self._themeState = newThemeState
end end
-- Only process button events if callback exists, element is not disabled, -- Only process button events if onEvent handler exists, element is not disabled,
-- and this is the topmost element at the mouse position (z-index ordering) -- and this is the topmost element at the mouse position (z-index ordering)
-- Exception: Allow drag continuation even if occluded (once drag starts, it continues) -- Exception: Allow drag continuation even if occluded (once drag starts, it continues)
local isDragging = false local isDragging = false
@@ -3280,7 +3280,7 @@ function Element:update(dt)
end end
end end
local canProcessEvents = (self.callback or self.editable) and not self.disabled and (isActiveElement or isDragging) local canProcessEvents = (self.onEvent or self.editable) and not self.disabled and (isActiveElement or isDragging)
if canProcessEvents then if canProcessEvents then
-- Check all three mouse buttons -- Check all three mouse buttons
@@ -3299,7 +3299,7 @@ function Element:update(dt)
else else
-- Just pressed - fire press event and record drag start position -- Just pressed - fire press event and record drag start position
local modifiers = getModifiers() local modifiers = getModifiers()
if self.callback then if self.onEvent then
local pressEvent = InputEvent.new({ local pressEvent = InputEvent.new({
type = "press", type = "press",
button = button, button = button,
@@ -3308,7 +3308,7 @@ function Element:update(dt)
modifiers = modifiers, modifiers = modifiers,
clickCount = 1, clickCount = 1,
}) })
self.callback(self, pressEvent) self.onEvent(self, pressEvent)
end end
self._pressed[button] = true self._pressed[button] = true
@@ -3331,7 +3331,7 @@ function Element:update(dt)
if lastX ~= mx or lastY ~= my then if lastX ~= mx or lastY ~= my then
-- Mouse has moved - fire drag event only if still hovering -- Mouse has moved - fire drag event only if still hovering
if self.callback and isHovering then if self.onEvent and isHovering then
local modifiers = getModifiers() local modifiers = getModifiers()
local dx = mx - self._dragStartX[button] local dx = mx - self._dragStartX[button]
local dy = my - self._dragStartY[button] local dy = my - self._dragStartY[button]
@@ -3346,7 +3346,7 @@ function Element:update(dt)
modifiers = modifiers, modifiers = modifiers,
clickCount = 1, clickCount = 1,
}) })
self.callback(self, dragEvent) self.onEvent(self, dragEvent)
end end
-- Handle text selection drag for editable elements -- Handle text selection drag for editable elements
@@ -3386,7 +3386,7 @@ function Element:update(dt)
eventType = "middleclick" eventType = "middleclick"
end end
if self.callback then if self.onEvent then
local clickEvent = InputEvent.new({ local clickEvent = InputEvent.new({
type = eventType, type = eventType,
button = button, button = button,
@@ -3396,7 +3396,7 @@ function Element:update(dt)
clickCount = clickCount, clickCount = clickCount,
}) })
self.callback(self, clickEvent) self.onEvent(self, clickEvent)
end end
self._pressed[button] = false self._pressed[button] = false
@@ -3429,7 +3429,7 @@ function Element:update(dt)
end end
-- Fire release event -- Fire release event
if self.callback then if self.onEvent then
local releaseEvent = InputEvent.new({ local releaseEvent = InputEvent.new({
type = "release", type = "release",
button = button, button = button,
@@ -3438,7 +3438,7 @@ function Element:update(dt)
modifiers = modifiers, modifiers = modifiers,
clickCount = clickCount, clickCount = clickCount,
}) })
self.callback(self, releaseEvent) self.onEvent(self, releaseEvent)
end end
end end
else else
@@ -3450,10 +3450,10 @@ function Element:update(dt)
end end
end end
end end
end -- end if self.callback end -- end if self.onEvent
-- Handle touch events (maintain backward compatibility) -- Handle touch events (maintain backward compatibility)
if self.callback then if self.onEvent then
local touches = love.touch.getTouches() local touches = love.touch.getTouches()
for _, id in ipairs(touches) do for _, id in ipairs(touches) do
local tx, ty = love.touch.getPosition(id) local tx, ty = love.touch.getPosition(id)
@@ -3469,7 +3469,7 @@ function Element:update(dt)
modifiers = getModifiers(), modifiers = getModifiers(),
clickCount = 1, clickCount = 1,
}) })
self.callback(self, touchEvent) self.onEvent(self, touchEvent)
self._touchPressed[id] = false self._touchPressed[id] = false
end end
end end

4
modules/GuiState.lua
View File

@@ -131,8 +131,8 @@ function GuiState.getTopElementAt(x, y)
local function findInteractiveAncestor(elem) local function findInteractiveAncestor(elem)
local current = elem local current = elem
while current do while current do
-- An element is interactive if it has a callback, themeComponent, or is editable -- An element is interactive if it has an onEvent handler, themeComponent, or is editable
if current.callback or current.themeComponent or current.editable then if current.onEvent or current.themeComponent or current.editable then
return current return current
end end
current = current.parent current = current.parent

2
modules/StateManager.lua
View File

@@ -60,7 +60,7 @@ local function hashProps(props, visited, depth)
-- Properties to skip (they cause issues or aren't relevant for ID generation) -- Properties to skip (they cause issues or aren't relevant for ID generation)
local skipKeys = { local skipKeys = {
callback = true, onEvent = true,
parent = true, parent = true,
children = true, children = true,
onFocus = true, onFocus = true,

2
modules/utils.lua
View File

@@ -34,7 +34,7 @@
---@field flexWrap FlexWrap? -- Whether children wrap to multiple lines: "nowrap"|"wrap"|"wrap-reverse" (default: NOWRAP) ---@field flexWrap FlexWrap? -- Whether children wrap to multiple lines: "nowrap"|"wrap"|"wrap-reverse" (default: NOWRAP)
---@field justifySelf JustifySelf? -- Alignment of the item itself along main axis (default: AUTO) ---@field justifySelf JustifySelf? -- Alignment of the item itself along main axis (default: AUTO)
---@field alignSelf AlignSelf? -- Alignment of the item itself along cross axis (default: AUTO) ---@field alignSelf AlignSelf? -- Alignment of the item itself along cross axis (default: AUTO)
---@field callback fun(element:Element, event:InputEvent)? -- Callback function for interaction events ---@field onEvent fun(element:Element, event:InputEvent)? -- Callback function for interaction events
---@field onFocus fun(element:Element, event:InputEvent)? -- Callback when element receives focus ---@field onFocus fun(element:Element, event:InputEvent)? -- Callback when element receives focus
---@field onBlur fun(element:Element, event:InputEvent)? -- Callback when element loses focus ---@field onBlur fun(element:Element, event:InputEvent)? -- Callback when element loses focus
---@field onTextInput fun(element:Element, text:string)? -- Callback when text is input ---@field onTextInput fun(element:Element, text:string)? -- Callback when text is input

20
testing/__tests__/16_event_system_tests.lua
View File

@@ -49,7 +49,7 @@ function TestEventSystem:test_event_object_has_required_fields()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
eventReceived = event eventReceived = event
end, end,
}) })
@@ -82,7 +82,7 @@ function TestEventSystem:test_left_click_generates_click_event()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
table.insert(eventsReceived, { type = event.type, button = event.button }) table.insert(eventsReceived, { type = event.type, button = event.button })
end, end,
}) })
@@ -118,7 +118,7 @@ function TestEventSystem:test_right_click_generates_rightclick_event()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
table.insert(eventsReceived, { type = event.type, button = event.button }) table.insert(eventsReceived, { type = event.type, button = event.button })
end, end,
}) })
@@ -151,7 +151,7 @@ function TestEventSystem:test_middle_click_generates_middleclick_event()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
table.insert(eventsReceived, { type = event.type, button = event.button }) table.insert(eventsReceived, { type = event.type, button = event.button })
end, end,
}) })
@@ -184,7 +184,7 @@ function TestEventSystem:test_modifier_keys_are_detected()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
eventReceived = event eventReceived = event
end end
@@ -213,7 +213,7 @@ function TestEventSystem:test_double_click_increments_click_count()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
table.insert(clickEvents, event.clickCount) table.insert(clickEvents, event.clickCount)
end end
@@ -248,7 +248,7 @@ function TestEventSystem:test_press_and_release_events_are_fired()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
table.insert(eventsReceived, event.type) table.insert(eventsReceived, event.type)
end, end,
}) })
@@ -288,7 +288,7 @@ function TestEventSystem:test_event_contains_mouse_position()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
eventReceived = event eventReceived = event
end end
@@ -318,7 +318,7 @@ function TestEventSystem:test_no_callback_when_clicking_outside_element()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
callbackCalled = true callbackCalled = true
end, end,
}) })
@@ -343,7 +343,7 @@ function TestEventSystem:test_multiple_modifiers_detected()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(element, event) onEvent = function(element, event)
if event.type == "click" then if event.type == "click" then
eventReceived = event eventReceived = event
end end

16
testing/__tests__/29_drag_event_tests.lua
View File

@@ -32,7 +32,7 @@ function TestDragEvent:test_drag_event_fired_on_mouse_movement()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
dragEventReceived = true dragEventReceived = true
dragEvent = event dragEvent = event
@@ -62,7 +62,7 @@ function TestDragEvent:test_drag_event_contains_delta_values()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
dragEvent = event dragEvent = event
end end
@@ -94,7 +94,7 @@ function TestDragEvent:test_drag_event_updates_delta_continuously()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
table.insert(dragEvents, { dx = event.dx, dy = event.dy }) table.insert(dragEvents, { dx = event.dx, dy = event.dy })
end end
@@ -130,7 +130,7 @@ function TestDragEvent:test_no_drag_event_when_mouse_stationary()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
dragEventCount = dragEventCount + 1 dragEventCount = dragEventCount + 1
end end
@@ -158,7 +158,7 @@ function TestDragEvent:test_drag_tracking_cleaned_up_on_release()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
table.insert(dragEvents, { dx = event.dx, dy = event.dy }) table.insert(dragEvents, { dx = event.dx, dy = event.dy })
end end
@@ -199,7 +199,7 @@ function TestDragEvent:test_drag_works_with_different_buttons()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
table.insert(dragEvents, { button = event.button, dx = event.dx }) table.insert(dragEvents, { button = event.button, dx = event.dx })
end end
@@ -232,7 +232,7 @@ function TestDragEvent:test_drag_event_contains_mouse_position()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
dragEvent = event dragEvent = event
end end
@@ -260,7 +260,7 @@ function TestDragEvent:test_no_drag_when_mouse_leaves_element()
y = 100, y = 100,
width = 200, width = 200,
height = 100, height = 100,
callback = function(el, event) onEvent = function(el, event)
if event.type == "drag" then if event.type == "drag" then
dragEventCount = dragEventCount + 1 dragEventCount = dragEventCount + 1
end end