change default ball to soccer ball

2 files changed, 13 insertions, 3 deletions

diff --git a/FractionBounceActivity.py b/FractionBounceActivity.py
index 51113ff..db2b7e6 100644
--- a/FractionBounceActivity.py
+++ b/FractionBounceActivity.py
@@ -162,7 +162,7 @@ class FractionBounceActivity(activity.Activity):
         separator_factory(toolbar, expand=False, visible=True)
         separator_factory(toolbar, expand=False, visible=False)
         self._ball_selector = combo_factory(BALLS, toolbar, self._combo_cb,
-                                            default=_('basketball'),
+                                            default=_('soccer ball'),
                                             tooltip=_('choose a ball'))
 
     def _setup_canvas(self):
diff --git a/bounce.py b/bounce.py
index e8badcd..6d428bf 100644
--- a/bounce.py
+++ b/bounce.py
@@ -162,7 +162,7 @@ class Bounce():
                      '#C0C0C0', '#282828') + \
             svg_footer())
 
-        self.ball = Ball(self.sprites, os.path.join(path, 'basketball.svg'))
+        self.ball = Ball(self.sprites, os.path.join(path, 'soccer.svg'))
         self.current_frame = 0
 
         self.bar = Bar(self.sprites, self.width, self.height, self.scale,
@@ -464,9 +464,19 @@ class Bounce():
 
     def _expose_cb(self, win, event):
         ''' Callback to handle window expose events '''
-        self.sprites.redraw_sprites(event.area)
+        self.do_expose_event(event)
         return True
 
+    def do_expose_event(self, event):
+        ''' Handle the expose-event by drawing '''
+        # Restrict Cairo to the exposed area
+        cr = self.canvas.window.cairo_create()
+        cr.rectangle(event.area.x, event.area.y,
+                event.area.width, event.area.height)
+        cr.clip()
+        # Refresh sprite list
+        self.sprites.redraw_sprites(cr=cr)
+
     def _destroy_cb(self, win, event):
         ''' Callback to handle quit '''
         gtk.main_quit()