GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Frame drag fix

Browse Source 
Fixed a dragging bug on frames
This commit is contained in:
Robert Jelic
2022-08-29 18:50:18 +02:00
parent b10ec1770c
commit 23b94d076b
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Basalt/Frame.lua
View File

@@ -853,14 +853,16 @@ return function(name, parent, pTerm, basalt)
self:updateDraw() self:updateDraw()
return true return true
end end
if(events["mouse_drag"]~=nil)then if(self:isVisible())and(self:isEnabled())then
for _, index in ipairs(eventZIndex["mouse_drag"]) do if(events["mouse_drag"]~=nil)then
if (events["mouse_drag"][index] ~= nil) then for _, index in ipairs(eventZIndex["mouse_drag"]) do
for _, value in rpairs(events["mouse_drag"][index]) do if (events["mouse_drag"][index] ~= nil) then
if (value.dragHandler ~= nil) then for _, value in rpairs(events["mouse_drag"][index]) do
if (value:dragHandler(button, x, y)) then if (value.dragHandler ~= nil) then
focusSystem(self) if (value:dragHandler(button, x, y)) then
return true focusSystem(self)
return true
end
end end
end end
end end

10
Basalt/Object.lua
View File

@@ -56,17 +56,21 @@ return function(name)
isVisible = false isVisible = false
self:updateDraw() self:updateDraw()
return self return self
end; end,
enable = function(self) enable = function(self)
isEnabled = true isEnabled = true
return self return self
end; end,
disable = function(self) disable = function(self)
isEnabled = false isEnabled = false
return self return self
end; end,
isEnabled = function(self)
return isEnabled
end,
generateXMLEventFunction = function(self, func, val) generateXMLEventFunction = function(self, func, val)
local createF = function(str) local createF = function(str)

2
Basalt/main.lua
View File

@@ -8,7 +8,7 @@ local createText = utils.createText
local baseTerm = term.current() local baseTerm = term.current()
local version = "1.6.0" local version = "1.6.1"
local debugger = true local debugger = true
local projectDirectory = fs.getDir(table.pack(...)[2] or "") local projectDirectory = fs.getDir(table.pack(...)[2] or "")