X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=bin%2Fembrace;h=f7ae62b0cf9ac72c17113b558c37a80e033e568d;hb=b0551cddd6ab569d3ef743946b7a6720ae8bc9e7;hp=2316b0ddbc3cc8bd703a4260109e85e4efc38849;hpb=4fb9f489f87f5e5afeeade1c2a49a461de910bc4;p=embrace.git

diff --git a/bin/embrace b/bin/embrace
index 2316b0d..f7ae62b 100755
--- a/bin/embrace
+++ b/bin/embrace
@@ -83,9 +83,20 @@ module Embrace
 	class AlphaAnimator < ZeroToOneAnimator
 		def initialize(duration, *objects)
 			super(duration) do |v|
-				objects.each { |o| o.alpha = (255 * v).to_i }
+				a = compute_alpha(v)
+				objects.each { |o| o.alpha = 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,11 +116,23 @@ 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)
 			super(evas)
 
+			self.name = label
+
 			@slot = nil
 			@alpha_anim = nil
 
@@ -119,38 +142,47 @@ 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)
 
 			@img.set_file(ICON_FILE)
 			@img.set_fill(0, 0, *@img.get_size)
 
-			@label.text = label
+			@label.text = name
 			@label.set_font("VeraBd", 10)
 
 			resize(*@img.get_size)
 		end
 
-		def label
-			@label.text
+		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 on_show
+		def smart_show
 			@objects.each { |o| o.show }
-
-			@alpha_anim ||= AlphaAnimator.new(2, @img, @label)
-			@alpha_anim.on_finished { @alpha_anim = nil }
 		end
 
-		def on_hide
+		def smart_hide
 			@objects.each { |o| o.hide }
 
 			@alpha_anim && @alpha_anim.delete
 			@alpha_anim = nil
 		end
 
-		def on_delete
+		def smart_delete
 			@objects.each { |o| o.delete }
 			@objects.clear
 
@@ -159,15 +191,19 @@ module Embrace
 			@img = @label = @alpha_anim = nil
 		end
 
-		def on_move(x, y)
+		def smart_move(x, y)
 			@objects.each { |o| o.move(x, y) }
 
 			@label.center(self)
 		end
 
-		def on_resize(w, h)
+		def smart_resize(w, h)
 			@img.resize(w, h)
 		end
+
+		def smart_color_set(r, g, b, a)
+			@objects.each { |o| o.alpha = a }
+		end
 	end
 
 	class Container < Evas::Smart
@@ -175,13 +211,11 @@ module Embrace
 		class ContainerFullError < ContainerError; end
 		class ContainerLockedError < ContainerError; end
 
-		include Enumerable
-
 		def initialize(evas)
 			super
 
 			@bg = Evas::Rectangle.new(evas)
-			@bg.set_color(0, 0, 0, 255)
+			@bg.set_color(0, 0, 0, 8)
 
 			add_member(@bg)
 
@@ -190,10 +224,19 @@ module Embrace
 
 			@about_to_add = 0
 			@add_lock_count = 0
+
+			@handlers = [
+				Ecore::EventHandler.new(MailboxIcon::FadeOutFinishedEvent,
+				                        &method(:on_icon_fade_out_finished))
+			]
 		end
 
-		def each
-			@icons.compact.each { |i| yield i }
+		def can_add?
+			!slots_left.zero? && @add_lock_count.zero?
+		end
+
+		def can_delete?
+			@about_to_add.zero? && @add_lock_count.zero?
 		end
 
 		def <<(i)
@@ -203,7 +246,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 +280,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|
@@ -256,24 +306,24 @@ module Embrace
 		end
 
 		# smart callbacks
-		def on_show
+		def smart_show
 			@bg.show
 		end
 
-		def on_hide
+		def smart_hide
 			@bg.hide
 		end
 
-		def on_delete
+		def smart_delete
 			@bg.delete
 			@bg = nil
 		end
 
-		def on_move(x, y)
+		def smart_move(x, y)
 			@bg.move(x, y)
 		end
 
-		def on_resize(w, h)
+		def smart_resize(w, h)
 			@bg.resize(w, h)
 		end
 
@@ -295,6 +345,7 @@ module Embrace
 		def initialize
 			super
 
+			self.has_alpha = true
 			self.title = "Embrace"
 			self.borderless = true
 
@@ -338,10 +389,6 @@ module Embrace
 		end
 
 		private
-		def add_icon(name)
-			@container << MailboxIcon.new(evas, name)
-		end
-
 		def on_timer
 			return unless @server.nil?
 
@@ -358,24 +405,12 @@ module Embrace
 				lbl = md.captures.first
 			end
 
-			found = @container.find { |i| i.label == lbl }
-
-			begin
-				if ev.count.zero?
-					unless found.nil?
-						#puts "removing icon #{lbl}"
-						@container.delete(found)
-					else
-						#puts "count == 0, but icon not found (#{lbl})"
-					end
-				elsif found.nil?
-					#puts "adding icon #{lbl}"
-					add_icon(lbl)
-				else
-					#puts "count > 0, but already there (#{lbl})"
-				end
-			rescue Exception => e
-				puts e.message
+			found = evas.find_object(lbl)
+
+			if ev.count.zero? && !found.nil? && @container.can_delete?
+				@container.delete(found)
+			elsif !ev.count.zero? && found.nil? && @container.can_add?
+				@container << MailboxIcon.new(evas, lbl)
 			end
 
 			false