Merge branch 'projects'
This commit is contained in:
parent
aa6e25d5b1
commit
b1e8bba30d
|
@ -317,7 +317,7 @@ end
|
|||
function core.try(fn, ...)
|
||||
local err
|
||||
local ok, res = xpcall(fn, function(msg)
|
||||
print(debug.traceback())
|
||||
print(msg, debug.traceback())
|
||||
local item = core.error("%s", msg)
|
||||
item.info = debug.traceback(nil, 2):gsub("\t", "")
|
||||
err = msg
|
||||
|
|
|
@ -57,7 +57,7 @@ local function draw_items(self, items, x, y, draw_fn)
|
|||
local color = style.text
|
||||
|
||||
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
|
||||
elseif type(item) == "table" then
|
||||
color = item
|
||||
|
|
Loading…
Reference in a new issue