Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct issues in collapse management with accordion widget 

closes: #725
This commit is contained in:
tshirtman 2012-10-08 15:34:14 +02:00
parent 8b279daeb3
commit 12d6453987
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kivy/uix/accordion.py
View File

@ -91,9 +91,9 @@ from kivy.animation import Animation
from kivy.uix.floatlayout import FloatLayout from kivy.uix.floatlayout import FloatLayout
from kivy.clock import Clock from kivy.clock import Clock
from kivy.lang import Builder from kivy.lang import Builder
from kivy.properties import ObjectProperty, StringProperty, \ from kivy.properties import (ObjectProperty, StringProperty,
BooleanProperty, NumericProperty, ListProperty, OptionProperty, \ BooleanProperty, NumericProperty,
DictProperty ListProperty, OptionProperty, DictProperty)
from kivy.uix.widget import Widget from kivy.uix.widget import Widget
from kivy.logger import Logger from kivy.logger import Logger
@ -236,8 +236,8 @@ class AccordionItem(FloatLayout):
self._anim_collapse = None self._anim_collapse = None
super(AccordionItem, self).__init__(**kwargs) super(AccordionItem, self).__init__(**kwargs)
self.bind(title=self._trigger_title, self.bind(title=self._trigger_title,
title_template=self._trigger_title, title_template=self._trigger_title,
title_args=self._trigger_title) title_args=self._trigger_title)
self._trigger_title() self._trigger_title()
def add_widget(self, widget): def add_widget(self, widget):
@ -285,7 +285,9 @@ class AccordionItem(FloatLayout):
c = self.container_title c = self.container_title
c.clear_widgets() c.clear_widgets()
instance = Builder.template(self.title_template, instance = Builder.template(self.title_template,
title=self.title, item=self, **self.title_args) title=self.title,
item=self,
**self.title_args)
c.add_widget(instance) c.add_widget(instance)
@ -340,12 +342,9 @@ class Accordion(Widget):
def add_widget(self, widget, *largs): def add_widget(self, widget, *largs):
if not isinstance(widget, AccordionItem): if not isinstance(widget, AccordionItem):
raise AccordionException('Accordion accept only AccordionItem') raise AccordionException('Accordion accept only AccordionItem')
widget.accordion = self widget.accordion = self
ret = super(Accordion, self).add_widget(widget, *largs) ret = super(Accordion, self).add_widget(widget, *largs)
all_collapsed = \
list(set(([x.collapse for x in self.children]))) == [True]
if all_collapsed:
widget.collapse = False
return ret return ret
def select(self, instance): def select(self, instance):
@ -360,6 +359,11 @@ class Accordion(Widget):
def _do_layout(self, dt): def _do_layout(self, dt):
children = self.children children = self.children
all_collapsed = False not in [x.collapse for x in children]
if all_collapsed:
children[0].collapse = False
orientation = self.orientation orientation = self.orientation
min_space = self.min_space min_space = self.min_space
min_space_total = len(children) * self.min_space min_space_total = len(children) * self.min_space
@ -380,6 +384,7 @@ class Accordion(Widget):
if orientation == 'horizontal': if orientation == 'horizontal':
children = reversed(children) children = reversed(children)
for child in children: for child in children:
child_space = min_space child_space = min_space
child_space += display_space * (1 - child.collapse_alpha) child_space += display_space * (1 - child.collapse_alpha)