scissor for interepreter, speed backwards

ricardoquesada · ricardoquesada · commit 1c804b04cfc2 · 2008-07-08T06:38:30.000Z
diff --git a/cocos/layer/python_interpreter.py b/cocos/layer/python_interpreter.py
@@ -104,13 +104,19 @@ def on_enter(self):
 
         self.start_of_line = len(self.document.text)
 
-    def on_resize(self, vw, vh):
+    def on_resize(self, x, y):
+        vw, vh = director.get_window_size()
         self.layout.begin_update()
         self.layout.height = vh
         self.layout.x = 2
         self.layout.width = vw - 4
         self.layout.y = vh
         self.layout.end_update()
+
+        # XXX: hack
+        x,y = director.window.width, director.window.height
+        self.layout.top_group._scissor_width=x-4
+
         self.caret.position = len(self.document.text)
 
     def on_exit(self):
diff --git a/cocos/scenes/transitions.py b/cocos/scenes/transitions.py
@@ -93,6 +93,8 @@ def __init__(self, dst, duration=1.25, src=None):
             src = director.scene
         self.out_scene = src                    #: scene that will be replaced
         self.duration = duration                #: duration in seconds of the transition
+        if not self.duration:
+            self.duration = 1.25
 
         if self.out_scene is None:
             raise Exception("You need to specfy a `src` argument")
diff --git a/samples/presentation/presentation.py b/samples/presentation/presentation.py
@@ -88,13 +88,15 @@ def __init__(self, scenes, transitions=None):
         
             
     def next_scene(self):
+        self.duration = None
         self.scene_p +=1 
         if self.scene_p >= len(self.scenes):
             self.scene_p = len(self.scenes)-1
         else:
             self.transition(self.transitions[self.scene_p%len(self.transitions)-1])
     
     def prev_scene(self):
+        self.duration=0.5
         self.scene_p -=1 
         if self.scene_p < 0:
             self.scene_p = 0
@@ -106,7 +108,7 @@ def transition(self, transition=None):
         if transition:
             director.replace( transition(
                         self.scenes[ self.scene_p ],
-#                        duration = 1
+                        duration = self.duration
                          )
                 )
         else:
