Changeset 3284

Timestamp:

08/01/08 19:55:05 (5 years ago)

Author:

nopper

Message:

fixing show and allocate bugs

Files:

• branch/PacketManipulator/widgets/Expander.py (modified) (10 diffs)

branch/PacketManipulator/widgets/Expander.py

@@ -37 +37 @@
 # Requires PyGTK 2.8.0 or later
 
+__all__ = ['AnimatedExpander', 'ToolBox']
+
 class Child:
     widget = None
@@ -178 +180 @@
 
     def do_expose_event(self, event):
+        if self._animating:
+            if not self.flags() & gtk.VISIBLE:
+                self.show()
+        else:
+            if self._to_show:
+                if not self.flags() & gtk.VISIBLE:
+                    self.show()
+            else:
+                if self.flags() & gtk.VISIBLE:
+                    self.hide()
+
         if event.window != self._bin_window:
             return False
@@ -444 +457 @@
         self.pack_start(self._layout)
         
-        self.set_size_request(40, 100)
         self.show_all()
-
-    def do_size_allocate(self, allocation):
-        # We should force a size allocate to avoid bugs
-        # when the widget is getting too small!
-        gtk.VBox.do_size_allocate(self, allocation)
-        self._layout.size_allocate(self._layout.allocation)
 
     def do_realize(self):
@@ -460 +466 @@
 
         self._happy_box.modify_bg(gtk.STATE_NORMAL, bg_color)
+
+        # Uhmma uhmma bad trick!
+        if not self._layout._to_show:
+            self._layout.hide()
 
     def add_widget(self, widget, show=False):
@@ -473 +483 @@
 
     def add(self, widget):
-        self.add_widget(widget, False) #FIXME
+        self.add_widget(widget, True)
 
     def get_label(self):
@@ -586 +596 @@
         self.pack_start(page, False, False)
         self._pages.append(page)
-        #self.set_active_page(page)
+        #self._set_active_page(page)
     
     # Private API
@@ -667 +677 @@
             # if not ignore the page._expand and set the packing to True
 
-            print "yuuuuuuuuu"
-
             for child in self.get_children():
-                print "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
                 print self.query_child_packing(child)
 
@@ -700 +707 @@
 
     exp = klass("miao")
-    exp.add(sw)
+    exp.add_widget(sw, False)
 
     vbox.pack_start(exp, False, False)
@@ -708 +715 @@
 
     exp = klass("miao")
-    exp.add(sw)
+    exp.add_widget(sw, False)
     vbox.pack_start(exp)
 
@@ -725 +732 @@
 
 if __name__ == "__main__":
-    #main(AnimatedExpander)
+    main(AnimatedExpander)
     #main(gtk.Expander)
     toolbox()