Fixed animation to use Clutter GI properly. Moved to main window class.

3 files changed, 58 insertions, 73 deletions

diff --git a/caribou/ui/Makefile.am b/caribou/ui/Makefile.am
index 8813480..fb24db4 100644
--- a/caribou/ui/Makefile.am
+++ b/caribou/ui/Makefile.am
@@ -2,7 +2,6 @@ caribou_uidir = $(pkgpythondir)/ui/
 
 caribou_ui_PYTHON = \
 	__init__.py \
-	animation.py \
 	i18n.py \
 	keyboard.py \
 	scan.py \
diff --git a/caribou/ui/animation.py b/caribou/ui/animation.py
deleted file mode 100644
index c382929..0000000
--- a/caribou/ui/animation.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Caribou - text entry and UI navigation application
-#
-# Copyright (C) 2009 Eitan Isaacson <eitan@monotonous.org>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation; either version 2.1 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from gi.repository import Clutter
-
-class AnimatedWindowBase(object):
-    def __init__(self, ease=Clutter.AnimationMode.EASE_IN_QUAD):
-        if self.__class__ == AnimatedWindowBase:
-            raise TypeError, \
-                "AnimatedWindowBase is an abstract class, " \
-                "must be subclassed with a Gtk.Window"
-
-        self._actor = Clutter.Rectangle()
-        self.ease = ease
-
-    def _on_new_frame(self, timeline, timing):
-        x, y = self._actor.get_position()
-        self.move(int(x), int(y))
-
-    def animated_move(self, x, y):
-        orig_x, orig_y = self.get_position()
-        self._actor.set_position(orig_x, orig_y)
-        #allocation = self.get_allocation()
-        #print allocation.width, allocation.height
-        #self._actor.set_size(self.allocation.width, self.allocation.height)
-        animation = self._actor.animatev(self.ease, 250, ["x", "y"])
-        timeline = animation.get_timeline()
-        timeline.connect('new-frame', self._on_new_frame)
-        
-        return animation
-        
-if __name__ == "__main__":
-    import gobject
-    from gi.repository import Gtk
-    class AnimatedWindow(Gtk.Window, AnimatedWindowBase):
-        def __init__(self):
-            gobject.GObject.__init__(self)
-            AnimatedWindowBase.__init__(self)
-
-    aw = AnimatedWindow()
-    aw.show_all()
-    aw.move(100, 100)
-    #aw.animated_move(200, 200)
-    Gtk.main()
-
-
diff --git a/caribou/ui/window.py b/caribou/ui/window.py
index 78b2c61..995889e 100644
--- a/caribou/ui/window.py
+++ b/caribou/ui/window.py
@@ -20,11 +20,11 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-import animation
 from caribou import data_path
 from gi.repository import GConf
 from gi.repository import Gtk
 from gi.repository import Gdk
+from gi.repository import Clutter
 import opacity
 import os
 import sys
@@ -33,10 +33,19 @@ import gobject
 CARIBOU_GCONF_LAYOUT_KEY = '/apps/caribou/osk/layout'
 CARIBOU_LAYOUT_DIR = 'keyboards'
 
-class CaribouWindow(Gtk.Window):
+Clutter.init("caribou")
+
+class CaribouWindow(Gtk.Window, Clutter.Animatable):
     __gtype_name__ = "CaribouWindow"
+    __gproperties__ = { 
+        'animated-window-position' : (gobject.TYPE_PYOBJECT, 'Window position',
+                                      'Window position in X, Y coordinates',
+                                      gobject.PARAM_READWRITE)        
+        }
+
     def __init__(self, text_entry_mech, default_placement=None,
-                 min_alpha=1.0, max_alpha=1.0, max_distance=100):
+                 min_alpha=1.0, max_alpha=1.0, max_distance=100,
+                 animation_mode=Clutter.AnimationMode.EASE_IN_QUAD):
         gobject.GObject.__init__(self, type=Gtk.WindowType.POPUP)
 
         self.set_name("CaribouWindow")
@@ -60,6 +69,48 @@ class CaribouWindow(Gtk.Window):
 
         self.connect('show', self._on_window_show)
 
+        # animation
+        self.animation_mode = animation_mode
+        self._stage = Clutter.Stage.get_default()
+        self._animation = None
+
+    def do_get_property(self, property):
+        if property.name == "animated-window-position":
+            return self.get_position()
+        else:
+            raise AttributeError, 'unknown property %s' % property.name
+
+    def do_set_property(self, property, value):
+        if property.name == "animated-window-position":
+            if value is not None:
+                x, y = value
+                self.move(x, y)
+        else:
+            raise AttributeError, 'unknown property %s' % property.name
+
+    def do_animate_property(self, animation, prop_name, initial_value,
+                            final_value, progress, gvalue):
+        if prop_name != "animated-window-position": return False
+        
+        ix, iy = initial_value
+        fx, fy = final_value
+        dx = int((fx - ix) * progress)
+        dy = int((fy - iy) * progress)
+        new_value = (ix + dx, iy + dy)
+        self.move(*new_value)
+        return True
+
+    def animated_move(self, x, y):
+        self._animation = Clutter.Animation(object=self,
+                                            mode=self.animation_mode,
+                                            duration=250)
+        self._animation.bind("animated-window-position", (x, y))
+
+        timeline = self._animation.get_timeline()
+        timeline.start()
+
+        return self._animation
+
     def destroy(self):
         self.keyboard.destroy()
         super(Gtk.Window, self).destroy()
@@ -182,7 +233,6 @@ class CaribouWindow(Gtk.Window):
         self.resize(req.width + border, req.height + border)
 
 class CaribouWindowDocked(CaribouWindow, 
-                          animation.AnimatedWindowBase,
                           opacity.ProximityWindowBase):
     __gtype_name__ = "CaribouWindowDocked"
     
@@ -195,7 +245,6 @@ class CaribouWindowDocked(CaribouWindow,
             xgravitate=CaribouWindowPlacement.INSIDE)
 
         CaribouWindow.__init__(self, text_entry_mech, placement)
-        animation.AnimatedWindowBase.__init__(self)
         opacity.ProximityWindowBase.__init__(
             self, min_alpha=0.5, max_alpha=0.8)
 
@@ -206,12 +255,12 @@ class CaribouWindowDocked(CaribouWindow,
 
     def _roll_in(self):
         x, y = self.get_position()
-        self.move(x + self.allocation.width, y)
-        #return self.animated_move(x, y)
+        self.move(x + self.get_allocated_width(), y)
+        return self.animated_move(x, y)
 
     def _roll_out(self):
         x, y = self.get_position()
-        #return self.animated_move(x + self.allocation.width, y)
+        return self.animated_move(x + self.get_allocated_width(), y)
 
     def hide(self):
         animation = self._roll_out()
@@ -315,7 +364,7 @@ if __name__ == "__main__":
     import signal
     signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-    w = CaribouWindowDocked(keyboard.CaribouKeyboard)
+    w = CaribouWindowDocked(keyboard.CaribouKeyboard())
     w.show_all()
 
     try: