X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=bin%2Fembrace;h=1d28c908d65f5b274d92dfc4068b3529332ba85e;hb=633df2fe37fade5c825f3829386fefff357f592e;hp=b586afe5b4c12e206a7f2c092e05fee384355456;hpb=f201a1dce85804a7d4acde2af2b63dea795a69cc;p=embrace.git diff --git a/bin/embrace b/bin/embrace index b586afe..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 @@ -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,11 +112,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 +138,45 @@ 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) - @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 +185,20 @@ 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) + @img.set_color(r, g, b, a) + @label.set_color(r, 0, 0, a) + end end class Container < Evas::Smart @@ -175,13 +206,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 +219,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.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 +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 @@ -235,17 +273,25 @@ 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 - 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| @@ -255,24 +301,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 @@ -294,6 +340,7 @@ module Embrace def initialize super + self.has_alpha = true self.title = "Embrace" self.borderless = true @@ -337,10 +384,6 @@ module Embrace end private - def add_icon(name) - @container << MailboxIcon.new(evas, name) - end - def on_timer return unless @server.nil? @@ -357,24 +400,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