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

small bugfix

Browse Source
This commit is contained in:
Robert Jelic
2022-07-08 21:06:12 +02:00
parent b78bf92cca
commit c6d7929741
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Basalt/main.lua
View File

@@ -64,8 +64,10 @@ local bInstance = {
} }
local function drawFrames() local function drawFrames()
mainFrame:draw() if(mainFrame~=nil)then
mainFrame:drawUpdate() mainFrame:draw()
mainFrame:drawUpdate()
end
for _,v in pairs(monFrames)do for _,v in pairs(monFrames)do
v:draw() v:draw()
v:drawUpdate() v:drawUpdate()

9
Basalt/objects/Label.lua
View File

@@ -86,9 +86,10 @@ return function(name)
local splittedText = utils.splitString(self:getValue(), " ") local splittedText = utils.splitString(self:getValue(), " ")
local text = {} local text = {}
local line = "" local line = ""
for _,v in pairs(splittedText)do for k,v in pairs(splittedText)do
if(line:len()+v:len()<=self.width)then if(line:len()+v:len()<=self.width)then
line = line=="" and v or line.." "..v line = line=="" and v or line.." "..v
if(k==#splittedText)then table.insert(text, line) end
else else
table.insert(text, line) table.insert(text, line)
line = v:sub(1,self.width) line = v:sub(1,self.width)
@@ -98,11 +99,7 @@ return function(name)
self.parent:setText(obx, oby+k-1, v) self.parent:setText(obx, oby+k-1, v)
end end
else else
for n = 1, self.height do self.parent:setText(obx, oby, utils.getTextHorizontalAlign(self:getValue(), self.width, textHorizontalAlign))
if (n == verticalAlign) then
self.parent:setText(obx, oby + (n - 1), utils.getTextHorizontalAlign(self:getValue(), self.width, textHorizontalAlign))
end
end
end end
else else
local tData = bigFont(fontsize, self:getValue(), self.fgColor, self.bgColor or colors.black) local tData = bigFont(fontsize, self:getValue(), self.fgColor, self.bgColor or colors.black)