From fbdc1fa3b06be65234e09415a49d96ed80734a03 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:52:25 +0200 Subject: [PATCH] Small bugfix Fixed border bug --- Basalt/plugins/border.lua | 94 +++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/Basalt/plugins/border.lua b/Basalt/plugins/border.lua index 55d12af..eebf20a 100644 --- a/Basalt/plugins/border.lua +++ b/Basalt/plugins/border.lua @@ -5,8 +5,8 @@ return { local object = { setBorder = function(self, ...) - if(...~=nil)then - local t = {...} + local t = {...} + if(t~=nil)then for k,v in pairs(t)do if(v=="left")or(#t==1)then borderColors["left"] = t[1] @@ -29,51 +29,51 @@ return { draw = function(self) base.draw(self) self:addDraw("border", function() - if(border~=false)then - local x, y = self:getPosition() - local w,h = self:getSize() - local bgCol = self:getBackground() - if(inline)then - if(borderColors["left"]~=false)then - self:addTextBox(1, 1, 1, h, "\149") - if(bgCol~=false)then self:addBackgroundBox(1, 1, 1, h, bgCol) end - self:addForegroundBox(1, 1, 1, h, borderColors["left"]) - end - if(borderColors["top"]~=false)then - self:addTextBox(1, 1, w, 1, "\131") - if(bgCol~=false)then self:addBackgroundBox(1, 1, w, 1, bgCol) end - self:addForegroundBox(1, 1, w, 1, borderColors["top"]) - end - if(borderColors["left"]~=false)and(borderColors["top"]~=false)then - self:addTextBox(1, 1, 1, 1, "\151") - if(bgCol~=false)then self:addBackgroundBox(1, 1, 1, 1, bgCol) end - self:drawForegroundBox(1, 1, 1, 1, borderColors["left"]) - end - if(borderColors["right"]~=false)then - self:addTextBox(w, 1, 1, h, "\149") - if(bgCol~=false)then self:addForegroundBox(w, 1, 1, h, bgCol) end - self:addBackgroundBox(w, 1, 1, h, borderColors["right"]) - end - if(borderColors["bottom"]~=false)then - self:addTextBox(1, h, w, 1, "\143") - if(bgCol~=false)then self:addForegroundBox(1, h, w, 1, bgCol) end - self:addBackgroundBox(1, h, w, 1, borderColors["bottom"]) - end - if(borderColors["top"]~=false)and(borderColors["right"]~=false)then - self:addTextBox(w, 1, 1, 1, "\148") - if(bgCol~=false)then self:addForegroundBox(w, 1, 1, 1, bgCol) end - self:addBackgroundBox(w, 1, 1, 1, borderColors["right"]) - end - if(borderColors["right"]~=false)and(borderColors["bottom"]~=false)then - self:addTextBox(w, h, 1, 1, "\133") - if(bgCol~=false)then self:addForegroundBox(w, h, 1, 1, bgCol) end - self:addBackgroundBox(w, h, 1, 1, borderColors["right"]) - end - if(borderColors["bottom"]~=false)and(borderColors["left"]~=false)then - self:addTextBox(1, h, 1, 1, "\138") - if(bgCol~=false)then self:addForegroundBox(0, h, 1, 1, bgCol) end - self:addBackgroundBox(1, h, 1, 1, borderColors["left"]) - end + local x, y = self:getPosition() + local w,h = self:getSize() + local bgCol = self:getBackground() + if(inline)then + if(borderColors["left"]~=false)then + self:addTextBox(1, 1, 1, h, "\149") + if(bgCol~=false)then self:addBackgroundBox(1, 1, 1, h, bgCol) end + self:addForegroundBox(1, 1, 1, h, borderColors["left"]) + end + + if(borderColors["top"]~=false)then + self:addTextBox(1, 1, w, 1, "\131") + if(bgCol~=false)then self:addBackgroundBox(1, 1, w, 1, bgCol) end + self:addForegroundBox(1, 1, w, 1, borderColors["top"]) + end + + if(borderColors["left"]~=false)and(borderColors["top"]~=false)then + self:addTextBox(1, 1, 1, 1, "\151") + if(bgCol~=false)then self:addBackgroundBox(1, 1, 1, 1, bgCol) end + self:addForegroundBox(1, 1, 1, 1, borderColors["left"]) + end + if(borderColors["right"]~=false)then + self:addTextBox(w, 1, 1, h, "\149") + if(bgCol~=false)then self:addForegroundBox(w, 1, 1, h, bgCol) end + self:addBackgroundBox(w, 1, 1, h, borderColors["right"]) + end + if(borderColors["bottom"]~=false)then + self:addTextBox(1, h, w, 1, "\143") + if(bgCol~=false)then self:addForegroundBox(1, h, w, 1, bgCol) end + self:addBackgroundBox(1, h, w, 1, borderColors["bottom"]) + end + if(borderColors["top"]~=false)and(borderColors["right"]~=false)then + self:addTextBox(w, 1, 1, 1, "\148") + if(bgCol~=false)then self:addForegroundBox(w, 1, 1, 1, bgCol) end + self:addBackgroundBox(w, 1, 1, 1, borderColors["right"]) + end + if(borderColors["right"]~=false)and(borderColors["bottom"]~=false)then + self:addTextBox(w, h, 1, 1, "\133") + if(bgCol~=false)then self:addForegroundBox(w, h, 1, 1, bgCol) end + self:addBackgroundBox(w, h, 1, 1, borderColors["right"]) + end + if(borderColors["bottom"]~=false)and(borderColors["left"]~=false)then + self:addTextBox(1, h, 1, 1, "\138") + if(bgCol~=false)then self:addForegroundBox(0, h, 1, 1, bgCol) end + self:addBackgroundBox(1, h, 1, 1, borderColors["left"]) end end end)