r6455 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets

[johannes]

Author: johannes
Date: 2004-10-05 05:12:10 -0500 (Tue, 05 Oct 2004)
New Revision: 6455

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Use better algorithm for determining the widget-width and -height


Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-10-05 08:14:04 UTC 
(rev 6454)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-10-05 10:12:10 UTC 
(rev 6455)
@@ -117,13 +117,19 @@
       gtk.timeout_add (1500, lambda splash: splash.destroy (), self.splash)
 
     self.font       = APPFONT
-    self.textWidth  = CHAR_WIDTH
-    self.textHeight = CHAR_HEIGHT
 
+    sr = (CHAR_WIDTH, CHAR_HEIGHT)
+    for widgetModule in self._supportedWidgets.values ():
+      if hasattr (widgetModule, 'size_request'):
+        need = widgetModule.size_request ()
+        sr = (max (sr [0], need [0]), max (sr [1], need [1]))
+
+    (self.textWidth, self.textHeight) = sr
+
     gDebug (1, "Metrics %s x %s" % (self.textWidth, self.textHeight))
 
     self.widgetWidth  = self.textWidth
-    self.widgetHeight = self.textHeight + 3
+    self.widgetHeight = self.textHeight
 
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-10-05 
08:14:04 UTC (rev 6454)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-10-05 
10:12:10 UTC (rev 6455)
@@ -69,6 +69,22 @@
 
 
 # -----------------------------------------------------------------------------
+# Determine the minimum size of a button widget
+# -----------------------------------------------------------------------------
+
+def size_request ():
+  """
+  This function returns a tuple (width, height) describing the minimum size of
+  a button widget. Actually only the height is meaningfull for a button.
+  """
+
+  button = gtk.Button ('Foo yeah')
+  (w, height) = button.size_request ()
+  return (None, height)
+
+
+
+# -----------------------------------------------------------------------------
 # Configuration data
 # -----------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-10-05 
08:14:04 UTC (rev 6454)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-10-05 
10:12:10 UTC (rev 6455)
@@ -541,6 +541,26 @@
 
 
 # -----------------------------------------------------------------------------
+# Determine the minimum size of a button widget
+# -----------------------------------------------------------------------------
+
+def size_request ():
+  """
+  This function returns a tuple (width, height) describing the minimum size of
+  entry widgets. Actually only an entry and a combo box is used here, where
+  only the height portion get's returned.
+  """
+
+  e = gtk.Entry ()
+  (w, eHeight) = e.size_request ()
+  c = gtk.Combo ()
+  (w, cHeight) = e.size_request ()
+
+  return (None, max (eHeight, cHeight))
+
+
+
+# -----------------------------------------------------------------------------
 # Base configuration data
 # -----------------------------------------------------------------------------