From b1e8bba30d426f346f21beb1a4939d8a88838c7b Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Sat, 26 Jun 2021 13:49:20 -0400 Subject: [PATCH] Merge branch 'projects' --- data/core/init.lua | 2 +- data/core/statusview.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/core/init.lua b/data/core/init.lua index 3af4844..2e89969 100644 --- a/data/core/init.lua +++ b/data/core/init.lua @@ -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 diff --git a/data/core/statusview.lua b/data/core/statusview.lua index 67a4c8b..3f09de9 100644 --- a/data/core/statusview.lua +++ b/data/core/statusview.lua @@ -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