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

Small fix

Browse Source 
Small XML borderColor fix
This commit is contained in:
Robert Jelic
2023-02-20 16:28:22 +01:00
parent 50dce1c1e7
commit 6f0ddd6bf6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Basalt/Object.lua
View File

@@ -135,10 +135,10 @@ return function(name)
if(xmlValue("anchor", data)~=nil)then self:setAnchor(xmlValue("anchor", data)) end if(xmlValue("anchor", data)~=nil)then self:setAnchor(xmlValue("anchor", data)) end
if(xmlValue("shadowColor", data)~=nil)then self:setShadow(colors[xmlValue("shadowColor", data)]) end if(xmlValue("shadowColor", data)~=nil)then self:setShadow(colors[xmlValue("shadowColor", data)]) end
if(xmlValue("border", data)~=nil)then self:setBorder(colors[xmlValue("border", data)]) end if(xmlValue("border", data)~=nil)then self:setBorder(colors[xmlValue("border", data)]) end
if(xmlValue("borderLeft", data)~=nil)then borderColors["left"] = xmlValue("borderLeft", data) end if(xmlValue("borderLeft", data)~=nil)then borderColors["left"] = colors[xmlValue("borderLeft", data)] end
if(xmlValue("borderTop", data)~=nil)then borderColors["top"] = xmlValue("borderTop", data) end if(xmlValue("borderTop", data)~=nil)then borderColors["top"] = colors[xmlValue("borderTop", data)] end
if(xmlValue("borderRight", data)~=nil)then borderColors["right"] = xmlValue("borderRight", data) end if(xmlValue("borderRight", data)~=nil)then borderColors["right"] = colors[xmlValue("borderRight", data)] end
if(xmlValue("borderBottom", data)~=nil)then borderColors["bottom"] = xmlValue("borderBottom", data) end if(xmlValue("borderBottom", data)~=nil)then borderColors["bottom"] = colors[xmlValue("borderBottom", data)] end
if(xmlValue("borderColor", data)~=nil)then self:setBorder(colors[xmlValue("borderColor", data)]) end if(xmlValue("borderColor", data)~=nil)then self:setBorder(colors[xmlValue("borderColor", data)]) end
if(xmlValue("ignoreOffset", data)~=nil)then if(xmlValue("ignoreOffset", data))then self:ignoreOffset(true) end end if(xmlValue("ignoreOffset", data)~=nil)then if(xmlValue("ignoreOffset", data))then self:ignoreOffset(true) end end
if(xmlValue("onClick", data)~=nil)then self:generateXMLEventFunction(self.onClick, xmlValue("onClick", data)) end if(xmlValue("onClick", data)~=nil)then self:generateXMLEventFunction(self.onClick, xmlValue("onClick", data)) end

9
Basalt/objects/Textfield.lua
View File

@@ -10,7 +10,7 @@ return function(name)
local objectType = "Textfield" local objectType = "Textfield"
local hIndex, wIndex, textX, textY = 1, 1, 1, 1 local hIndex, wIndex, textX, textY = 1, 1, 1, 1
local lines = { " " } local lines = { "" }
local bgLines = { "" } local bgLines = { "" }
local fgLines = { "" } local fgLines = { "" }
local keyWords = { } local keyWords = { }
@@ -216,7 +216,7 @@ return function(name)
end; end;
clear = function(self) clear = function(self)
lines = {" "} lines = {""}
bgLines = {""} bgLines = {""}
fgLines = {""} fgLines = {""}
startSelX,endSelX,startSelY,endSelY = nil,nil,nil,nil startSelX,endSelX,startSelY,endSelY = nil,nil,nil,nil
@@ -299,7 +299,7 @@ return function(name)
table.remove(bgLines, index or #bgLines) table.remove(bgLines, index or #bgLines)
table.remove(fgLines, index or #fgLines) table.remove(fgLines, index or #fgLines)
else else
lines = {" "} lines = {""}
bgLines = {""} bgLines = {""}
fgLines = {""} fgLines = {""}
end end
@@ -720,6 +720,7 @@ return function(name)
self.parent:setBG(obx, oby + n - 1, bg) self.parent:setBG(obx, oby + n - 1, bg)
self.parent:setFG(obx, oby + n - 1, fg) self.parent:setFG(obx, oby + n - 1, fg)
end end
--[[
if(startSelX~=nil)and(endSelX~=nil)and(startSelY~=nil)and(endSelY~=nil)then if(startSelX~=nil)and(endSelX~=nil)and(startSelY~=nil)and(endSelY~=nil)then
local sx,ex,sy,ey = getSelectionCoordinates(self) local sx,ex,sy,ey = getSelectionCoordinates(self)
for n=sy,ey do for n=sy,ey do
@@ -737,7 +738,7 @@ return function(name)
self.parent:setBG(obx + xOffset, oby + n - 1, rep(tHex[selectionBG], line)) self.parent:setBG(obx + xOffset, oby + n - 1, rep(tHex[selectionBG], line))
self.parent:setFG(obx + xOffset, oby + n - 1, rep(tHex[selectionFG], line)) self.parent:setFG(obx + xOffset, oby + n - 1, rep(tHex[selectionFG], line))
end end
end end]]
if(self:isFocused())then if(self:isFocused())then
local anchx, anchy = self:getAnchorPosition() local anchx, anchy = self:getAnchorPosition()
--self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor) --self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor)