Merge lp:~sneakypete81/simplegc/simplegc into lp:simplegc

[sneakypete]

Add the ability to specify the fade in/out rate on a per-widget basis.

[Sam Bull (dreamsorcerer)]

This will be refactored in the next major release, to provide more flexible animations. I'll make sure to allow custom speed changes in the default animation. If you want to be updated on progress, I've added a bug you can subscribe to: https://bugs.launchpad.net/simplegc/+bug/1169738

review: Disapprove

Unmerged revisions

356. By sneakypete on 2013-04-14

Make widget fade delay configurable

=== modified file 'sgc/widgets/_locals.py'
--- sgc/widgets/_locals.py	2013-03-22 17:24:10 +0000
+++ sgc/widgets/_locals.py	2013-04-14 19:36:32 +0000
@@ -45,9 +45,9 @@
         if widget._fade is not None:
             widget.image.set_alpha(widget._fade)
             if widget._fade_up:
-                widget._fade += time / 3.
+                widget._fade += float(time) / widget._fade_delay
             else:
-                widget._fade -= time / 4.
+                widget._fade -= float(time) / widget._fade_delay
             if widget._fade <= 0:
                 # Remove after fading
                 widget.kill()

=== modified file 'sgc/widgets/base_widget.py'
--- sgc/widgets/base_widget.py	2013-03-22 17:24:10 +0000
+++ sgc/widgets/base_widget.py	2013-04-14 19:36:32 +0000
@@ -46,6 +46,7 @@
 
     _fade = None  # Alpha level when fading
     _fade_up = True
+    _fade_delay = 1
     _custom_image = False
     _custom_extra = ()
     _label = None
@@ -154,7 +155,7 @@
         """Widgets should overload for custom widget configuration."""
         pass
 
-    def add(self, order=None, fade=True, focus=False):
+    def add(self, order=None, fade=True, focus=False, fade_delay=3):
         """
         Add widget to screen.
 
@@ -165,13 +166,17 @@
           fade: True if widget should fade in, False if not.
           focus: To focus widget immediately, use 1 if focused by keyboard,
               2 if by mouse, otherwise 0.
+          fade_delay: Higher numbers fade the widget in more slowly
 
         """
         added = add_widget(self, order, focus)
 
         # Fade widget in
+        if fade_delay < 1:
+            fade_delay = 1
         if fade:
             self._fade_up = True
+            self._fade_delay = fade_delay
             if added and self._fade is None: self._fade = 1
             self.image.set_alpha(self._fade)
         else:
@@ -182,16 +187,20 @@
         if self._label is not None:
             self._label.add(fade=fade)
 
-    def remove(self, fade=True):
+    def remove(self, fade=True, fade_delay=4):
         """
         Remove widget from screen.
 
         Args:
           fade: True if widget should fade out.
+          fade_delay: Higher numbers fade the widget out more slowly
 
         """
+        if fade_delay < 1:
+            fade_delay = 1
         if fade:  # Fade widget out
             self._fade_up = False
+            self._fade_delay = fade_delay
             if self._fade is None: self._fade = 250
         else:  # Remove widget immediately
             self.kill()