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

This commit is contained in:
Christopher Denter 2011-02-25 16:48:46 +01:00
commit 7353ba2fdd
2 changed files with 7 additions and 0 deletions

View File

@ -710,7 +710,10 @@ class BuilderBase(object):
listwidget = self.listwidget[:]
self.listwidget = []
for widget in listwidget:
self._push_ids()
self.idmap['root'] = widget
self.apply(widget)
self._pop_ids()
def build_handler(self, element, key, value, idmap, is_widget):
if key.startswith('on_'):

View File

@ -71,6 +71,10 @@ class BoxLayout(Layout):
kwargs.setdefault('size', (1, 1))
self._minimum_size = (0, 0)
super(BoxLayout, self).__init__(**kwargs)
self.bind(
spacing = self.update_minimum_size,
padding = self.update_minimum_size,
orientation = self.update_minimum_size)
self.bind(
spacing = self._trigger_layout,
padding = self._trigger_layout,