Updated for premul alpha changes in Evas.

[embrace.git] / bin / embrace

diff --git a/bin/embrace b/bin/embrace
index 6433d0475d371624a2b3a0024daebfdf62f6fd3d..1d28c908d65f5b274d92dfc4068b3529332ba85e 100755 (executable)
--- 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
@@ -81,11 +77,22 @@ module Embrace
        # an animator that runs for the specified number of seconds,
        # and yields values between 0 and 255
        class AlphaAnimator < ZeroToOneAnimator
-               def initialize(duration, *objects)
+               def initialize(duration, object)
                        super(duration) do |v|
-                               objects.each { |o| o.alpha = (255 * v).to_i }
+                               a = compute_alpha(v)
+                               object.set_color(a, a, a, a)
                        end
                end
+
+               def compute_alpha(v)
+                       (255 * v).to_i
+               end
+       end
+
+       class InverseAlphaAnimator < AlphaAnimator
+               def compute_alpha(v)
+                       super((1.0 - v).abs)
+               end
        end
 
        class MoveAnimator < ZeroToOneAnimator
@@ -105,6 +112,16 @@ module Embrace
        end
 
        class MailboxIcon < Evas::Smart
+               class FadeOutFinishedEvent < Ecore::Event
+                       attr_reader :icon
+
+                       def initialize(icon)
+                               super()
+
+                               @icon = icon
+                       end
+               end
+
                attr_accessor :slot
 
                def initialize(evas, label)
@@ -121,8 +138,7 @@ module Embrace
                        @objects = [@img, @label]
                        @objects.each { |o| add_member(o) }
 
-                       @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)
@@ -133,12 +149,24 @@ module Embrace
                        resize(*@img.get_size)
                end
 
+               def fade_in
+                       show
+
+                       @alpha_anim ||= AlphaAnimator.new(2, self)
+                       @alpha_anim.on_finished { @alpha_anim = nil }
+               end
+
+               def fade_out
+                       @alpha_anim ||= InverseAlphaAnimator.new(2, self)
+                       @alpha_anim.on_finished do
+                               @alpha_anim = nil
+                               FadeOutFinishedEvent.raise(self)
+                       end
+               end
+
                # smart callbacks
                def smart_show
                        @objects.each { |o| o.show }
-
-                       @alpha_anim ||= AlphaAnimator.new(2, @img, @label)
-                       @alpha_anim.on_finished { @alpha_anim = nil }
                end
 
                def smart_hide
@@ -166,6 +194,11 @@ module Embrace
                def smart_resize(w, h)
                        @img.resize(w, h)
                end
+
+               def smart_color_set(r, g, b, a)
+                       @img.set_color(r, g, b, a)
+                       @label.set_color(r, 0, 0, a)
+               end
        end
 
        class Container < Evas::Smart
@@ -186,6 +219,11 @@ module Embrace
 
                        @about_to_add = 0
                        @add_lock_count = 0
+
+                       @handlers = [
+                               Ecore::EventHandler.new(MailboxIcon::FadeOutFinishedEvent,
+                                                       &method(:on_icon_fade_out_finished))
+                       ]
                end
 
                def can_add?
@@ -203,7 +241,7 @@ module Embrace
                        i.move_relative(self, 0, 0)
                        i.slot = next_slot
                        i.clip = self
-                       i.show
+                       i.fade_in
 
                        # check whether we need to need to move this icon
                        if slots_left == 1
@@ -237,16 +275,23 @@ module Embrace
                        Kernel.raise(ContainerLockedError) unless @about_to_add.zero?
                        Kernel.raise(ContainerLockedError) unless @add_lock_count.zero?
 
-                       # icons that are placed above the one that's deleted need
-                       # to be moved
-                       ar = @icons[(i + 1)..-1]
+                       @add_lock_count += 1
+                       @icons[i].fade_out
+               end
 
-                       @icons[i].delete
+               def on_icon_fade_out_finished(ev)
+                       i = @icons.index(ev.icon)
+                       ev.icon.delete
                        @icons.delete_at(i)
 
-                       return if ar.empty?
+                       # icons that are placed above the one that's deleted need
+                       # to be moved. check whether are there any first
+                       if i == @icons.length
+                               @add_lock_count -= 1
+                               return
+                       end
 
-                       @add_lock_count += 1
+                       ar = @icons[i..-1]
 
                        @animators << MoveAnimator.new(2, Main.instance.icon_height, *ar)
                        @animators.last.on_finished do |ani|