Merge branch 'master' of https://github.com/kivy/kivy

Author: matham

kivy/gesture.py

@@ -38,20 +38,9 @@
 import zlib
 import math
 
-from kivy.compat import PY2
 from kivy.vector import Vector
 
-# XXX we can't use io.StringIO in PY2 cause it require unicode
-# PY2 / StringIO ( str or unicode )
-# PY2 / cStringIO ( str )
-# PY3 / io.StringIO ( unicode )
-if PY2:
-    try:
-        from cStringIO import StringIO
-    except ImportError:
-        from StringIO import StringIO
-else:
-    from io import StringIO
+from io import BytesIO
 
 
 class GestureDatabase(object):
@@ -83,15 +72,15 @@ def find(self, gesture, minscore=0.9, rotation_invariant=True):
 
     def gesture_to_str(self, gesture):
         '''Convert a gesture into a unique string.'''
-        io = StringIO()
+        io = BytesIO()
         p = pickle.Pickler(io)
         p.dump(gesture)
         data = base64.b64encode(zlib.compress(io.getvalue(), 9))
         return data
 
     def str_to_gesture(self, data):
         '''Convert a unique string to a gesture.'''
-        io = StringIO(zlib.decompress(base64.b64decode(data)))
+        io = BytesIO(zlib.decompress(base64.b64decode(data)))
         p = pickle.Unpickler(io)
         gesture = p.load()
         return gesture

kivy/graphics/instructions.pxd

@@ -7,7 +7,6 @@ cdef class Canvas
 cdef class RenderContext
 
 from vbo cimport *
-from context_instructions cimport *
 from compiler cimport *
 from shader cimport *
 from texture cimport Texture
@@ -58,6 +57,9 @@ cdef class ContextInstruction(Instruction):
     cdef void push_state(self, str name) except *
     cdef void pop_state(self, str name) except *
 
+
+from context_instructions cimport BindTexture
+
 cdef class VertexInstruction(Instruction):
     cdef BindTexture texture_binding
     cdef VertexBatch batch

kivy/uix/scatter.py

@@ -415,24 +415,29 @@ def transform_with_touch(self, touch):
         if len(self._touches) == 1:
             return changed
 
-        # we have more than one touch...
-        points = [Vector(self._last_touch_pos[t]) for t in self._touches]
+        # we have more than one touch... list of last known pos
+        points = [Vector(self._last_touch_pos[t]) for t in self._touches
+                  if t is not touch]
+        # add current touch last
+        points.append(Vector(touch.pos))
 
         # we only want to transform if the touch is part of the two touches
-        # furthest apart! So first we find anchor, the point to transform
-        # around as the touch farthest away from touch
-        anchor = max(points, key=lambda p: p.distance(touch.pos))
+        # farthest apart! So first we find anchor, the point to transform
+        # around as another touch farthest away from current touch's pos
+        anchor = max(points[:-1], key=lambda p: p.distance(touch.pos))
 
         # now we find the touch farthest away from anchor, if its not the
         # same as touch. Touch is not one of the two touches used to transform
         farthest = max(points, key=anchor.distance)
-        if points.index(farthest) != self._touches.index(touch):
+        if farthest is not points[-1]:
             return changed
 
         # ok, so we have touch, and anchor, so we can actually compute the
         # transformation
         old_line = Vector(*touch.ppos) - anchor
         new_line = Vector(*touch.pos) - anchor
+        if not old_line.length():   # div by zero
+            return changed
 
         angle = radians(new_line.angle(old_line)) * self.do_rotation
         self.apply_transform(Matrix().rotate(angle, 0, 0, 1), anchor=anchor)

kivy/uix/tabbedpanel.py

@@ -521,7 +521,7 @@ def add_widget(self, widget, index=0):
             super(TabbedPanel, self).add_widget(widget, index)
         elif isinstance(widget, TabbedPanelHeader):
             self_tabs = self._tab_strip
-            self_tabs.add_widget(widget)
+            self_tabs.add_widget(widget, index)
             widget.group = '__tab%r__' % self_tabs.uid
             self.on_tab_width()
         else: