X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=bin%2Fembrace;h=4e5b64ebf3cbac0097ccb61b9c1af74a686c0007;hb=14d1460090aee21970fe84463764b4f9573f8122;hp=b586afe5b4c12e206a7f2c092e05fee384355456;hpb=f201a1dce85804a7d4acde2af2b63dea795a69cc;p=embrace.git

diff --git a/bin/embrace b/bin/embrace
index b586afe..4e5b64e 100755
--- a/bin/embrace
+++ b/bin/embrace
@@ -110,6 +110,8 @@ module Embrace
 		def initialize(evas, label)
 			super(evas)
 
+			self.name = label
+
 			@slot = nil
 			@alpha_anim = nil
 
@@ -125,32 +127,28 @@ module Embrace
 			@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
-		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,13 +157,13 @@ 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
 	end
@@ -175,8 +173,6 @@ module Embrace
 		class ContainerFullError < ContainerError; end
 		class ContainerLockedError < ContainerError; end
 
-		include Enumerable
-
 		def initialize(evas)
 			super
 
@@ -192,8 +188,12 @@ module Embrace
 			@add_lock_count = 0
 		end
 
-		def each
-			@icons.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)
@@ -235,6 +235,7 @@ module Embrace
 
 		def delete_at(i)
 			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
@@ -255,24 +256,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
 
@@ -337,10 +338,6 @@ module Embrace
 		end
 
 		private
-		def add_icon(name)
-			@container << MailboxIcon.new(evas, name)
-		end
-
 		def on_timer
 			return unless @server.nil?
 
@@ -357,24 +354,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