diff --git a/Basalt/objects/ScrollableFrame.lua b/Basalt/objects/ScrollableFrame.lua index 9dad9af..29e063c 100644 --- a/Basalt/objects/ScrollableFrame.lua +++ b/Basalt/objects/ScrollableFrame.lua @@ -25,7 +25,7 @@ return function(name, basalt) end end - if (h + x - width >= amount) then + if (w + x - width >= amount) then amount = max(w + x - width, 0) end end diff --git a/Basalt/objects/VisualObject.lua b/Basalt/objects/VisualObject.lua index 1fad765..27bf953 100644 --- a/Basalt/objects/VisualObject.lua +++ b/Basalt/objects/VisualObject.lua @@ -267,7 +267,7 @@ return function(name, basalt) isFocused = function(self) if (parent ~= nil) then - return parent:getFocusedObject() == self + return parent:getFocused() == self end return true end, diff --git a/Basalt/plugins/dynamicValues.lua b/Basalt/plugins/dynamicValues.lua index 4e9e9c6..7a6f3ea 100644 --- a/Basalt/plugins/dynamicValues.lua +++ b/Basalt/plugins/dynamicValues.lua @@ -28,7 +28,7 @@ return { local parent = self:getParent() local objects = {} for k,v in pairs(objectGroup)do - objects[v] = parent:getObject(v) + objects[v] = parent:getChild(v) if(objects[v]==nil)then error("Dynamic Values - unable to find object: "..v) end