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

(hopefully) fixed reactive decimals bug

Browse Source
This commit is contained in:
Robert Jelic
2025-05-09 03:29:43 +02:00
parent b0660a36bf
commit 14548d9632
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/elements/Slider.lua
View File

@@ -63,7 +63,6 @@ end
--- @return boolean handled Whether the event was handled --- @return boolean handled Whether the event was handled
--- @protected --- @protected
function Slider:mouse_click(button, x, y) function Slider:mouse_click(button, x, y)
self.basalt.LOGGER.debug("Slider:mouse_click", button, x, y)
if self:isInBounds(x, y) then if self:isInBounds(x, y) then
local relX, relY = self:getRelativePosition(x, y) local relX, relY = self:getRelativePosition(x, y)
local pos = self.get("horizontal") and relX or relY local pos = self.get("horizontal") and relX or relY

21
src/plugins/reactive.lua
View File

@@ -37,6 +37,9 @@ local function parseExpression(expr, element, propName)
if protectedNames[obj] then if protectedNames[obj] then
return obj.."."..prop return obj.."."..prop
end end
if tonumber(obj) then
return obj.."."..prop
end
return string.format('__getProperty("%s", "%s")', obj, prop) return string.format('__getProperty("%s", "%s")', obj, prop)
end) end)
@@ -52,6 +55,9 @@ local function parseExpression(expr, element, propName)
return element.parent:getState(prop) return element.parent:getState(prop)
end, end,
__getElementState = function(objName, prop) __getElementState = function(objName, prop)
if tonumber(objName) then
return nil
end
local target = element:getBaseFrame():getChild(objName) local target = element:getBaseFrame():getChild(objName)
if not target then if not target then
errorManager.header = "Reactive evaluation error" errorManager.header = "Reactive evaluation error"
@@ -61,6 +67,9 @@ local function parseExpression(expr, element, propName)
return target:getState(prop).value return target:getState(prop).value
end, end,
__getProperty = function(objName, propName) __getProperty = function(objName, propName)
if tonumber(objName) then
return nil
end
if objName == "self" then if objName == "self" then
return element.get(propName) return element.get(propName)
elseif objName == "parent" then elseif objName == "parent" then
@@ -105,11 +114,13 @@ local function validateReferences(expr, element)
return false return false
end end
else else
local target = element.parent:getChild(ref) if(tonumber(ref) == nil)then
if not target then local target = element.parent:getChild(ref)
errorManager.header = "Reactive evaluation error" if not target then
errorManager.error("Referenced element not found: " .. ref) errorManager.header = "Reactive evaluation error"
return false errorManager.error("Referenced element not found: " .. ref)
return false
end
end end
end end
end end