Merge text.love
This commit is contained in:
commit
6f9f6b591a
4
app.lua
4
app.lua
|
@ -350,10 +350,6 @@ function App.color(color)
|
|||
love.graphics.setColor(color.r, color.g, color.b, color.a)
|
||||
end
|
||||
|
||||
function colortable(app_color)
|
||||
return {app_color.r, app_color.g, app_color.b, app_color.a}
|
||||
end
|
||||
|
||||
-- prepend file/line/test
|
||||
function prepend_debug_info_to_test_failure(test_name, err)
|
||||
local err_without_line_number = err:gsub('^[^:]*:[^:]*: ', '')
|
||||
|
|
|
@ -12,7 +12,7 @@ function button(State, name, params)
|
|||
if State.button_handlers == nil then
|
||||
State.button_handlers = {}
|
||||
end
|
||||
love.graphics.setColor(params.color[1], params.color[2], params.color[3])
|
||||
love.graphics.setColor(params.bg.r, params.bg.g, params.bg.b, params.bg.a)
|
||||
love.graphics.rectangle('fill', params.x,params.y, params.w,params.h, 5,5)
|
||||
if params.icon then params.icon(params) end
|
||||
table.insert(State.button_handlers, params)
|
||||
|
|
Loading…
Reference in New Issue