X-Git-Url: http://git.code-monkey.de/?p=embrace.git;a=blobdiff_plain;f=bin%2Fembrace;fp=bin%2Fembrace;h=1d28c908d65f5b274d92dfc4068b3529332ba85e;hp=fa6f5534fe6abdd438800d5661409b70950844fa;hb=633df2fe37fade5c825f3829386fefff357f592e;hpb=0f8a9c03f5838812473819e7ef2c50261e352fe7 diff --git a/bin/embrace b/bin/embrace index fa6f553..1d28c90 100755 --- a/bin/embrace +++ b/bin/embrace @@ -40,10 +40,6 @@ class Evas::EvasObject move_relative(obj, (b[2] / 2) - (a[2] / 2), (b[3] / 2) - (a[3] / 2)) end - - def alpha=(alpha) - set_color(*(get_color[0..-2] << alpha)) - end end module Embrace @@ -83,7 +79,8 @@ module Embrace class AlphaAnimator < ZeroToOneAnimator def initialize(duration, object) super(duration) do |v| - object.alpha = compute_alpha(v) + a = compute_alpha(v) + object.set_color(a, a, a, a) end end @@ -141,9 +138,7 @@ module Embrace @objects = [@img, @label] @objects.each { |o| add_member(o) } - set_color(255, 255, 255, 0) - @img.set_color(255, 255, 255, 0) - @label.set_color(255, 0, 0, 0) + set_color(0, 0, 0, 0) @img.set_file(ICON_FILE) @img.set_fill(0, 0, *@img.get_size) @@ -201,7 +196,8 @@ module Embrace end def smart_color_set(r, g, b, a) - @objects.each { |o| o.alpha = a } + @img.set_color(r, g, b, a) + @label.set_color(r, 0, 0, a) end end