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

kivy/app.py

@@ -169,9 +169,9 @@ user in order to adapt or reload your UI. You can then overload the
             if config is self.config:
                 token = (section, key)
                 if token == ('section1', 'key1'):
-                    print('Our key1 have been changed to', value)
+                    print('Our key1 has been changed to', value)
                 elif token == ('section1', 'key2'):
-                    print('Our key2 have been changed to', value)
+                    print('Our key2 has been changed to', value)
 
 The Kivy configuration panel is added by default to the settings
 instance. If you don't want this panel, you can declare your Application as

kivy/uix/dropdown.py

@@ -314,6 +314,8 @@ class DropDown(ScrollView):
             return True
         if 'button' in touch.profile and touch.button.startswith('scroll'):
             return
+        if self.collide_point(*touch.pos):
+            return True
         if self.auto_dismiss:
             self.dismiss()
 

kivy/uix/scrollview.py

@@ -596,6 +596,7 @@ class ScrollView(StencilView):
             touch.push()
             touch.apply_transform_2d(self.to_local)
             if self.dispatch_children('on_scroll_start', touch):
+                touch.pop()
                 return True
             touch.pop()
 
@@ -730,6 +731,7 @@ class ScrollView(StencilView):
         touch.push()
         touch.apply_transform_2d(self.to_local)
         if self.dispatch_children('on_scroll_move', touch):
+            touch.pop()
             return True
         touch.pop()
 
@@ -810,6 +812,7 @@ class ScrollView(StencilView):
             touch.push()
             touch.apply_transform_2d(self.to_local)
             if super(ScrollView, self).on_touch_up(touch):
+                touch.pop()
                 return True
             touch.pop()
             return False
@@ -828,6 +831,7 @@ class ScrollView(StencilView):
             touch.push()
             touch.apply_transform_2d(self.to_local)
             if self.dispatch_children('on_scroll_stop', touch):
+                touch.pop()
                 return True
             touch.pop()
 

kivy/uix/spinner.py

@@ -117,7 +117,7 @@ class Spinner(Button):
 
     .. versionadded:: 1.4.0
     '''
-    
+
     sync_height = BooleanProperty(False)
     '''Each element in a dropdown list uses a default/user-supplied height.
     Set to True to propagate the Spinner's height value to each dropdown
@@ -138,7 +138,7 @@ class Spinner(Button):
         fbind('dropdown_cls', build_dropdown)
         fbind('option_cls', build_dropdown)
         fbind('values', self._update_dropdown)
-        fbind('size', self._update_dropdown)
+        fbind('size', self._update_dropdown_size)
         fbind('text_autoupdate', self._update_dropdown)
         build_dropdown()
 
@@ -156,6 +156,19 @@ class Spinner(Button):
         self._dropdown.bind(on_dismiss=self._close_dropdown)
         self._update_dropdown()
 
+    def _update_dropdown_size(self, *largs):
+        if not self.sync_height:
+            return
+        dp = self._dropdown
+        if not dp:
+            return
+
+        container = dp.container
+        if not container:
+            return
+        for value in container.children:
+            item.height = self.height
+
     def _update_dropdown(self, *largs):
         dp = self._dropdown
         cls = self.option_cls