Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Return `nil` in case of failure. 

Instead of an assert. If there is a "real" error, then a warning is
still printed, but otherwise this relax the requirements.
This commit is contained in:
Emmanuel Lepage Vallee 2019-04-18 18:11:31 -04:00
parent 96c4d001f1
commit 4cab9f8c38
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/wibox/widget/base.lua
View File

@ -7,6 +7,7 @@
local object = require("gears.object") local object = require("gears.object")
local cache = require("gears.cache") local cache = require("gears.cache")
local matrix = require("gears.matrix") local matrix = require("gears.matrix")
local gdebug = require("gears.debug")
local protected_call = require("gears.protected_call") local protected_call = require("gears.protected_call")
local gtable = require("gears.table") local gtable = require("gears.table")
local setmetatable = setmetatable local setmetatable = setmetatable
@ -609,17 +610,22 @@ end
-- --
-- @param wdg The value. -- @param wdg The value.
-- @param[opt=nil] ... Arguments passed to the contructor (if any). -- @param[opt=nil] ... Arguments passed to the contructor (if any).
-- @treturn The new widget.
-- @constructorfct wibox.widget.base.make_widget_from_value -- @constructorfct wibox.widget.base.make_widget_from_value
-- @treturn widget|nil The new widget or `nil` in case of failure.
function base.make_widget_from_value(wdg, ...) function base.make_widget_from_value(wdg, ...)
if not wdg then return nil end
local is_function, t = is_callable(wdg) local is_function, t = is_callable(wdg)
if is_function then if is_function then
wdg = wdg(...) wdg = wdg(...)
elseif t == "table" and not wdg.is_widget then elseif t == "table" then
wdg = base.make_widget_declarative(wdg) wdg = wdg.is_widget and wdg or base.make_widget_declarative(wdg)
else else
assert(wdg.is_widget, "The argument is not a function, table, or widget.") gdebug.print_warning(
"The argument is not a function, table, or widget."
)
return nil
end end
return wdg return wdg