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

Fixes

Browse Source 
Small fixes
This commit is contained in:
Robert Jelic
2023-05-22 17:03:31 +02:00
parent e67945fccf
commit 42972f3c2c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Basalt/objects/MovableFrame.lua
View File

@@ -50,13 +50,10 @@ return function(name, basalt)
dragHandler = function(self, btn, x, y)
if(base.dragHandler(self, btn, x, y))then
if (isDragging) then
local xO, yO = parent:getOffset()
xO = xO < 0 and math.abs(xO) or -xO
yO = yO < 0 and math.abs(yO) or -yO
local parentX = 1
local parentY = 1
parentX, parentY = parent:getAbsolutePosition()
self:setPosition(x + dragXOffset - (parentX - 1) + xO, y + dragYOffset - (parentY - 1) + yO)
self:setPosition(x + dragXOffset - (parentX - 1), y + dragYOffset - (parentY - 1))
self:updateDraw()
end
return true

4
Basalt/objects/Object.lua
View File

@@ -146,6 +146,10 @@ return function(name, basalt)
registerEvent = function(self, event, func)
if(parent~=nil)then
parent:addEvent(event, self)
if(event=="mouse_drag")then
parent:addEvent("mouse_click", self)
parent:addEvent("mouse_up", self)
end
end
eventSystem:registerEvent(event, func)
if (registeredEvents[event] == nil) then

5
Basalt/objects/ScrollableFrame.lua
View File

@@ -96,6 +96,7 @@ return function(name, basalt)
load = function(self)
base.load(self)
self:listenEvent("mouse_scroll")
self:listenEvent("mouse_drag")
end,
removeChildren = function(self)
@@ -121,12 +122,12 @@ return function(name, basalt)
if(obj.element.getIgnoreOffset())then
xO, yO = 0, 0
end
if (obj.element.scrollHandler(obj.element, dir, x+xO, y+yO)) then
if (obj.element.scrollHandler(obj.element, dir, x+xO, y+yO)) then
return true
end
end
end
scrollHandler(self, dir, x, y)
scrollHandler(self, dir)
self:clearFocusedChild()
return true
end