Ui enhancements 2.0 (#31)
* canvas overhaul * minor tweaks * list mode for overview * bugfixes + tweaks for editor 2.0 * minor tweaks * more editor work * refactor + new transitions * use layout() where appropriate and cleanup * mouse triple click + textEntry scroll ind * cleanup * cleanup + theme editor * color rework + cleanup * changes for deprecated ui methods * can now use named colors
This commit was merged in pull request #31.
This commit is contained in:
@@ -2,50 +2,85 @@ local Tween = require('opus.ui.tween')
|
||||
|
||||
local Transition = { }
|
||||
|
||||
function Transition.slideLeft(args)
|
||||
local ticks = args.ticks or 10
|
||||
local easing = args.easing or 'outQuint'
|
||||
local pos = { x = args.ex }
|
||||
local tween = Tween.new(ticks, pos, { x = args.x }, easing)
|
||||
function Transition.slideLeft(canvas, args)
|
||||
local ticks = args.ticks or 6
|
||||
local easing = args.easing or 'inCirc'
|
||||
local pos = { x = canvas.ex }
|
||||
local tween = Tween.new(ticks, pos, { x = canvas.x }, easing)
|
||||
|
||||
args.canvas:move(pos.x, args.canvas.y)
|
||||
canvas:move(pos.x, canvas.y)
|
||||
|
||||
return function()
|
||||
local finished = tween:update(1)
|
||||
args.canvas:move(math.floor(pos.x), args.canvas.y)
|
||||
args.canvas:dirty()
|
||||
canvas:move(math.floor(pos.x), canvas.y)
|
||||
canvas:dirty(true)
|
||||
return not finished
|
||||
end
|
||||
end
|
||||
|
||||
function Transition.slideRight(args)
|
||||
local ticks = args.ticks or 10
|
||||
local easing = args.easing or'outQuint'
|
||||
local pos = { x = -args.canvas.width }
|
||||
function Transition.slideRight(canvas, args)
|
||||
local ticks = args.ticks or 6
|
||||
local easing = args.easing or 'inCirc'
|
||||
local pos = { x = -canvas.width }
|
||||
local tween = Tween.new(ticks, pos, { x = 1 }, easing)
|
||||
|
||||
args.canvas:move(pos.x, args.canvas.y)
|
||||
canvas:move(pos.x, canvas.y)
|
||||
|
||||
return function()
|
||||
local finished = tween:update(1)
|
||||
args.canvas:move(math.floor(pos.x), args.canvas.y)
|
||||
args.canvas:dirty()
|
||||
canvas:move(math.floor(pos.x), canvas.y)
|
||||
canvas:dirty(true)
|
||||
return not finished
|
||||
end
|
||||
end
|
||||
|
||||
function Transition.expandUp(args)
|
||||
function Transition.expandUp(canvas, args)
|
||||
local ticks = args.ticks or 3
|
||||
local easing = args.easing or 'linear'
|
||||
local pos = { y = args.ey + 1 }
|
||||
local tween = Tween.new(ticks, pos, { y = args.y }, easing)
|
||||
local pos = { y = canvas.ey + 1 }
|
||||
local tween = Tween.new(ticks, pos, { y = canvas.y }, easing)
|
||||
|
||||
args.canvas:move(args.x, pos.y)
|
||||
canvas:move(canvas.x, pos.y)
|
||||
|
||||
return function()
|
||||
local finished = tween:update(1)
|
||||
args.canvas:move(args.x, math.floor(pos.y))
|
||||
args.canvas:dirty()
|
||||
canvas:move(canvas.x, math.floor(pos.y))
|
||||
canvas.parent:dirty(true)
|
||||
return not finished
|
||||
end
|
||||
end
|
||||
|
||||
function Transition.shake(canvas, args)
|
||||
local ticks = args.ticks or 8
|
||||
local i = ticks
|
||||
|
||||
return function()
|
||||
i = -i
|
||||
canvas:move(canvas.x + i, canvas.y)
|
||||
if i > 0 then
|
||||
i = i - 2
|
||||
end
|
||||
return i ~= 0
|
||||
end
|
||||
end
|
||||
|
||||
function Transition.shuffle(canvas, args)
|
||||
local ticks = args.ticks or 4
|
||||
local easing = args.easing or 'linear'
|
||||
local t = { }
|
||||
|
||||
for _,child in pairs(canvas.children) do
|
||||
t[child] = Tween.new(ticks, child, { x = child.x, y = child.y }, easing)
|
||||
child.x = math.random(1, canvas.parent.width)
|
||||
child.y = math.random(1, canvas.parent.height)
|
||||
end
|
||||
|
||||
return function()
|
||||
local finished
|
||||
for child, tween in pairs(t) do
|
||||
finished = tween:update(1)
|
||||
child:move(math.floor(child.x), math.floor(child.y))
|
||||
end
|
||||
return not finished
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user