[Commits] (davids) added first pass of better toolbar height calculation

[commits at osafoundation.org]

Commit by: davids
Modified files:
chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py 1.19 1.20

Log message:
added first pass of better toolbar height calculation

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py.diff?r1=text&tr1=1.19&r2=text&tr2=1.20

Index: chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.19 chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.20
--- chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.19	Fri Sep 10 16:36:16 2004
+++ chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py	Tue Sep 14 14:52:43 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.19 $"
-__date__ = "$Date: 2004/09/10 23:36:16 $"
+__version__ = "$Revision: 1.20 $"
+__date__ = "$Date: 2004/09/14 21:52:43 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -608,10 +608,13 @@
 class Toolbar (Block.RectangularChild, DynamicContainer):
     def instantiateWidget (self):
         self.ensureDynamicChildren ()
+        heightGutter = 2
+        if self.buttonsLabeled:
+            heightGutter += 22
         return wxToolbar(self.parentBlock.widget, 
                          Block.Block.getWidgetID(self),
                          wx.DefaultPosition,
-                         (300, self.toolSize.height+2),
+                         (300, self.toolSize.height+heightGutter),
                          style=self.calculate_wxStyle())
 
     def calculate_wxStyle (self):