r6076 - trunk/gnue-forms/src/uidrivers/gtk2/widgets

[johannes]

Author: johannes
Date: 2004-07-25 06:44:39 -0500 (Sun, 25 Jul 2004)
New Revision: 6076

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Define the height of widgets, instead of leaving it to default-value


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-25 
10:43:01 UTC (rev 6075)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-25 
11:44:39 UTC (rev 6076)
@@ -54,6 +54,9 @@
       gap  = hasattr (gfObject._gap, '_gap') and gfObject._gap + 1 or 1
       self.itemY = (posY + spacer * gap) * event.widgetHeight
 
+    if hasattr (gfObject, 'Char__height'):
+      self.itemHeight = gfObject.Char__height * event.widgetHeight
+
     newWidget = self._createWidget (event, spacer)
     if event.initialize:
       self._addToCrossRef (newWidget, gfObject, self)

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-25 
10:43:01 UTC (rev 6075)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-25 
11:44:39 UTC (rev 6076)
@@ -38,6 +38,8 @@
     object = event.object
     style  = object.style
 
+    print "W/H", self.itemWidth, self.itemHeight
+
     if style == 'dropdown':
       newWidget = self.__createDropDown (object, event)
 
@@ -74,7 +76,7 @@
     # Enter does NOT open the popup list
     newWidget.disable_activate ()
 
-    newWidget.set_size_request (self.itemWidth, -1)
+    newWidget.set_size_request (self.itemWidth, self.itemHeight)
     event.container.put (newWidget, self.itemX, self.itemY)
     newWidget.show ()
 
@@ -147,8 +149,7 @@
     viewport  = gtk.ScrolledWindow ()
     viewport.add_with_viewport (newWidget)
     viewport.set_policy (gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-    height = gfObject.Char__height * event.widgetHeight
-    viewport.set_size_request (self.itemWidth, height)
+    viewport.set_size_request (self.itemWidth, self.itemHeight)
 
     tBuffer = newWidget.get_buffer ()
     tBuffer._insert_handler = tBuffer.connect ('insert-text',
@@ -183,7 +184,7 @@
 
     newWidget = gtk.Entry (maxLen)
     newWidget.modify_font (self._uiDriver.font)
-    newWidget.set_size_request (self.itemWidth, -1)
+    newWidget.set_size_request (self.itemWidth, self.itemHeight)
 
     newWidget._insert_handler = newWidget.connect ('insert-text',
                                                    self.insertTextHandler,