epicknex/gui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

OnWheelMoved supported on a gui object

Browse Source
This commit is contained in:
Ryan Ward 2023-10-17 09:45:19 -04:00
parent a68966879d
commit 2bb4b8e25d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
init.lua
View File

@ -83,7 +83,7 @@ local function Hook(funcname, func)
end end
-- This will run the hooks after everything has loaded -- This will run the hooks after everything has loaded
updater:newTask(function() updater:newLoop(function(loop)
Hook("quit", gui.Events.OnQuit.Fire) Hook("quit", gui.Events.OnQuit.Fire)
Hook("directorydropped", gui.Events.OnDirectoryDropped.Fire) Hook("directorydropped", gui.Events.OnDirectoryDropped.Fire)
Hook("displayrotated", gui.Events.OnDisplayRotated.Fire) Hook("displayrotated", gui.Events.OnDisplayRotated.Fire)
@ -103,6 +103,7 @@ updater:newTask(function()
Hook("touchmoved", gui.Events.OnTouchMoved.Fire) Hook("touchmoved", gui.Events.OnTouchMoved.Fire)
Hook("touchpressed", gui.Events.OnTouchPressed.Fire) Hook("touchpressed", gui.Events.OnTouchPressed.Fire)
Hook("touchreleased", gui.Events.OnTouchReleased.Fire) Hook("touchreleased", gui.Events.OnTouchReleased.Fire)
loop:Destroy()
end) end)
-- Hotkeys -- Hotkeys
@ -470,6 +471,14 @@ function gui:newBase(typ, x, y, w, h, sx, sy, sw, sh, virtual)
return true return true
end end
local function defaultCheck(...)
if not c:isActive() then return end
local x, y = love.mouse.getPosition()
if c:canPress(x, y) then
return c, ...
end
end
setmetatable(c, gui) setmetatable(c, gui)
c.__variables = {clip = {false, 0, 0, 0, 0}} c.__variables = {clip = {false, 0, 0, 0, 0}}
c.active = true c.active = true
@ -496,6 +505,7 @@ function gui:newBase(typ, x, y, w, h, sx, sy, sw, sh, virtual)
c.OnExit = multi:newConnection() c.OnExit = multi:newConnection()
c.OnMoved = testHierarchy .. multi:newConnection() c.OnMoved = testHierarchy .. multi:newConnection()
c.OnWheelMoved = defaultCheck / gui.Events.OnWheelMoved
local dragging = false local dragging = false
local entered = false local entered = false