SpindleyQ/lite-hearted
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'projects'

Browse source
This commit is contained in:
Jeremy Penner 2021-06-26 13:49:20 -04:00
parent aa6e25d5b1
commit b1e8bba30d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/core/init.lua
View file

@ -317,7 +317,7 @@ end
function core.try(fn, ...) function core.try(fn, ...)
local err local err
local ok, res = xpcall(fn, function(msg) local ok, res = xpcall(fn, function(msg)
print(debug.traceback()) print(msg, debug.traceback())
local item = core.error("%s", msg) local item = core.error("%s", msg)
item.info = debug.traceback(nil, 2):gsub("\t", "") item.info = debug.traceback(nil, 2):gsub("\t", "")
err = msg err = msg

2
data/core/statusview.lua
View file

@ -57,7 +57,7 @@ local function draw_items(self, items, x, y, draw_fn)
local color = style.text local color = style.text
for _, item in ipairs(items) do for _, item in ipairs(items) do
if type(item) == "userdata" then if type(item) == "userdata" or (type(item) == "table" and item.get_width) then
font = item font = item
elseif type(item) == "table" then elseif type(item) == "table" then
color = item color = item