diff --git a/Basalt/Object.lua b/Basalt/Object.lua index 13df6ff..ce55fcb 100644 --- a/Basalt/Object.lua +++ b/Basalt/Object.lua @@ -135,10 +135,10 @@ return function(name) 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("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("borderTop", data)~=nil)then borderColors["top"] = xmlValue("borderTop", data) end - if(xmlValue("borderRight", data)~=nil)then borderColors["right"] = xmlValue("borderRight", data) end - if(xmlValue("borderBottom", data)~=nil)then borderColors["bottom"] = xmlValue("borderBottom", data) end + if(xmlValue("borderLeft", data)~=nil)then borderColors["left"] = colors[xmlValue("borderLeft", data)] end + if(xmlValue("borderTop", data)~=nil)then borderColors["top"] = colors[xmlValue("borderTop", data)] end + if(xmlValue("borderRight", data)~=nil)then borderColors["right"] = colors[xmlValue("borderRight", 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("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 diff --git a/Basalt/objects/Textfield.lua b/Basalt/objects/Textfield.lua index 334f256..fd04a90 100644 --- a/Basalt/objects/Textfield.lua +++ b/Basalt/objects/Textfield.lua @@ -10,7 +10,7 @@ return function(name) local objectType = "Textfield" local hIndex, wIndex, textX, textY = 1, 1, 1, 1 - local lines = { " " } + local lines = { "" } local bgLines = { "" } local fgLines = { "" } local keyWords = { } @@ -216,7 +216,7 @@ return function(name) end; clear = function(self) - lines = {" "} + lines = {""} bgLines = {""} fgLines = {""} startSelX,endSelX,startSelY,endSelY = nil,nil,nil,nil @@ -299,7 +299,7 @@ return function(name) table.remove(bgLines, index or #bgLines) table.remove(fgLines, index or #fgLines) else - lines = {" "} + lines = {""} bgLines = {""} fgLines = {""} end @@ -720,6 +720,7 @@ return function(name) self.parent:setBG(obx, oby + n - 1, bg) self.parent:setFG(obx, oby + n - 1, fg) end + --[[ if(startSelX~=nil)and(endSelX~=nil)and(startSelY~=nil)and(endSelY~=nil)then local sx,ex,sy,ey = getSelectionCoordinates(self) 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:setFG(obx + xOffset, oby + n - 1, rep(tHex[selectionFG], line)) end - end + end]] if(self:isFocused())then local anchx, anchy = self:getAnchorPosition() --self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor)