library-mirrors/LoveFrames
1
0
Fork 0
mirror of https://github.com/linux-man/LoveFrames.git synced 2024-11-18 16:04:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Kenny Shields 2014-02-26 07:37:20 -05:00
parent f5ca78d4ff
commit 669fa83d68
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/util.lua
View File

@ -157,7 +157,13 @@ function loveframes.util.GetDirectoryContents(dir, t)
local extension = parts[#parts] local extension = parts[#parts]
parts[#parts] = nil parts[#parts] = nil
local name = table.concat(parts) local name = table.concat(parts)
table.insert(t, {path = dir, fullpath = dir.. "/" ..v, requirepath = dir:gsub("/", ".") .. "." ..name, name = name, extension = extension}) table.insert(t, {
path = dir,
fullpath = dir.. "/" ..v,
requirepath = dir:gsub("/", ".") .. "." ..name,
name = name,
extension = extension
})
end end
end end

47
objects/text.lua
View File

@ -279,7 +279,14 @@ function newobject:SetText(t)
link = false link = false
end end
elseif dtype == "number" then elseif dtype == "number" then
table.insert(self.formattedtext, {font = prevfont, color = prevcolor, linkcolor = prevlinkcolor, linkhovercolor = prevlinkhovercolor, link = link, text = tostring(v)}) table.insert(self.formattedtext, {
font = prevfont,
color = prevcolor,
linkcolor = prevlinkcolor,
linkhovercolor = prevlinkhovercolor,
link = link,
text = tostring(v)
})
elseif dtype == "string" then elseif dtype == "string" then
if self.ignorenewlines then if self.ignorenewlines then
v = v:gsub("\n", " ") v = v:gsub("\n", " ")
@ -288,7 +295,14 @@ function newobject:SetText(t)
v = v:gsub("\n", " \n ") v = v:gsub("\n", " \n ")
local parts = loveframes.util.SplitString(v, " ") local parts = loveframes.util.SplitString(v, " ")
for i, j in ipairs(parts) do for i, j in ipairs(parts) do
table.insert(self.formattedtext, {font = prevfont, color = prevcolor, linkcolor = prevlinkcolor, linkhovercolor = prevlinkhovercolor, link = link, text = j}) table.insert(self.formattedtext, {
font = prevfont,
color = prevcolor,
linkcolor = prevlinkcolor,
linkhovercolor = prevlinkhovercolor,
link = link,
text = j
})
end end
end end
end end
@ -307,7 +321,15 @@ function newobject:SetText(t)
local itemw = v.font:getWidth(item) local itemw = v.font:getWidth(item)
if n ~= #data then if n ~= #data then
if (curw + itemw) > maxw then if (curw + itemw) > maxw then
table.insert(inserts, {key = key, font = v.font, color = v.color, linkcolor = prevlinkcolor, linkhovercolor = v.linkhovercolor, link = v.link, text = new}) table.insert(inserts, {
key = key,
font = v.font,
color = v.color,
linkcolor = prevlinkcolor,
linkhovercolor = v.linkhovercolor,
link = v.link,
text = new
})
new = item new = item
curw = 0 + itemw curw = 0 + itemw
key = key + 1 key = key + 1
@ -317,7 +339,15 @@ function newobject:SetText(t)
end end
else else
new = new .. item new = new .. item
table.insert(inserts, {key = key, font = v.font, color = v.color, linkcolor = prevlinkcolor, linkhovercolor = v.linkhovercolor, link = v.link, text = new}) table.insert(inserts, {
key = key,
font = v.font,
color = v.color,
linkcolor = prevlinkcolor,
linkhovercolor = v.linkhovercolor,
link = v.link,
text = new
})
end end
end end
end end
@ -325,7 +355,14 @@ function newobject:SetText(t)
end end
for k, v in ipairs(inserts) do for k, v in ipairs(inserts) do
table.insert(self.formattedtext, v.key, {font = v.font, color = v.color, linkcolor = prevlinkcolor, linkhovercolor = v.linkhovercolor, link = v.link, text = v.text}) table.insert(self.formattedtext, v.key, {
font = v.font,
color = v.color,
linkcolor = prevlinkcolor,
linkhovercolor = v.linkhovercolor,
link = v.link,
text = v.text
})
end end
local textdata = self.formattedtext local textdata = self.formattedtext