Changeset 3842

Timestamp:

02/16/12 16:42:28 (15 months ago)

Author:

prock

Message:

• Fixed some small problems with my last commit. I had to add an option to the deepApply allowing you to only affect widgets that are visible.
• The widget's visible state should also be accurate now.

[t:608]

Location:

trunk/engine/python/fife/extensions/pychan/widgets

Files:

• containers.py (modified) (7 diffs)
• scrollarea.py (modified) (1 diff)
• widget.py (modified) (3 diffs)

trunk/engine/python/fife/extensions/pychan/widgets/containers.py

@@ -118 +118 @@
 
         def addChild(self, widget):
+                """
+                Adds a child widget to the container.
+                
+                This makes the childs widgets visible state the same as the containers.
+                i.e. if the containter is visible the child will be as well and if the
+                container widget is hidden so will the child.  The child however WILL
+                be shown when you show the container widget.  If you want the child to 
+                be hidden when you show the container widget you must call child.hide().
+                """
                 widget.parent = self
                 widget._visible = self._visible
@@ -123 +132 @@
                 self.children_position_cache.append(widget)
                 self.real_widget.add(widget.real_widget)
-
+                
+                #update the states of the child widgets.  This does not actually call
+                #the show() or hide() functions of the widget.
+                if self._visible:
+                        def _show(shown_widget):
+                                shown_widget._visible = True
+                                
+                        self.deepApply(_show, shown_only=True)
+                else:
+                        def _hide(hidden_widget):
+                                hidden_widget._visible = False
+                                
+                        self.deepApply(_hide)
+                
         def insertChild(self, widget, position):
                 if position > len(self.children) or 0-position > len(self.children):
@@ -135 +157 @@
                 children = self.children[0:position]+[widget]+self.children[position:]
                 #assert len(children) == len(self.children) + 1
-                self.removeAllChildren()
+
+                for widget in self.children:
+                        self.removeChild(widget)
+                
                 for child in children:
                         self.addChild(child)
@@ -145 +170 @@
 
         def removeChild(self,widget):
-                if not widget in self.children:
+                if not widget in self.children and not widget in self.hidden_children:
                         raise RuntimeError("%s does not have %s as direct child widget." % (str(self),str(widget)))
-                self.children.remove(widget)
-                self.children_position_cache.remove(widget)
-                self.real_widget.remove(widget.real_widget)
-                
+
+                if widget in self.children:
+                        self.children.remove(widget)
+                        self.children_position_cache.remove(widget)
+                        self.real_widget.remove(widget.real_widget)
+
                 if widget in self.hidden_children:
                         self.hidden_children.remove(widget)
-                        
+
                 widget.parent = None
 
@@ -168 +195 @@
         def showChild(self, child):
                 if not child in self.hidden_children:
-                        return
-                        
+                        raise RuntimeError("%s does not have %s as hidden child widget." % (str(self), str(child)))
+        
                 self.hidden_children.remove(child)
                 
@@ -176 +203 @@
                 hidden_children = self.hidden_children[:]
                 
-                self.removeAllChildren()
+                for widget in children:
+                        self.removeChild(widget)
                 
                 for child_widget in children_position_cache:
@@ -197 +225 @@
                 return max(widget.height for widget in self.children)
 
-        def deepApply(self,visitorFunc, leaves_first = True):
-                children = []
-                children.extend(self.children)
-                children.extend(self.hidden_children)
+        def deepApply(self,visitorFunc, leaves_first = True, shown_only = False):
+                
+                if not shown_only:
+                        children = self.children + self.hidden_children
+                else:
+                        children = self.children
                 
                 if leaves_first:
                         for child in children:
-                                child.deepApply(visitorFunc, leaves_first = leaves_first)
+                                child.deepApply(visitorFunc, leaves_first = leaves_first, shown_only = shown_only)
                 visitorFunc(self)
                 if not leaves_first:
                         for child in children:
-                                child.deepApply(visitorFunc, leaves_first = leaves_first)
+                                child.deepApply(visitorFunc, leaves_first = leaves_first, shown_only = shown_only)
 
         def beforeShow(self):

trunk/engine/python/fife/extensions/pychan/widgets/scrollarea.py

@@ -104 +104 @@
         content = property(_getContent,_setContent)
 
-        def deepApply(self,visitorFunc, leaves_first = True):
+        def deepApply(self,visitorFunc, leaves_first = True, shown_only = False):
                 if leaves_first:
-                        if self._content: self._content.deepApply(visitorFunc, leaves_first = leaves_first)
+                        if self._content: self._content.deepApply(visitorFunc, leaves_first = leaves_first, shown_only = shown_only)
                 visitorFunc(self)
                 if not leaves_first:
-                        if self._content: self._content.deepApply(visitorFunc, leaves_first = leaves_first)
+                        if self._content: self._content.deepApply(visitorFunc, leaves_first = leaves_first, shown_only = shown_only)
 
         def resizeToContent(self,recurse=True):

trunk/engine/python/fife/extensions/pychan/widgets/widget.py

@@ -311 +311 @@
                         widget._visible = True
                                 
-                self.deepApply(_show)
+                self.deepApply(_show, shown_only=True)
 
         def hide(self):
@@ -331 +331 @@
                         widget._visible = False
                                 
-                self.deepApply(_hide)
+                self.deepApply(_hide, shown_only=True)
 
         def isVisible(self):
@@ -766 +766 @@
                 self.deepApply(_callExpandContent, leaves_first=False)
 
-        def deepApply(self,visitorFunc, leaves_first = True):
+        def deepApply(self,visitorFunc, leaves_first = True, shown_only = False):
                 """
                 Recursively apply a callable to all contained widgets and then the widget itself.