[gnue] r9123 - trunk/gnue-forms/src/uidrivers/curses/widgets

[johannes]

Author: johannes
Date: 2006-12-07 08:53:47 -0600 (Thu, 07 Dec 2006)
New Revision: 9123

Modified:
   trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
Log:
An entry is stretchable if used within a HBox or if it is a multiline


Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-12-07 
14:47:07 UTC (rev 9122)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-12-07 
14:53:47 UTC (rev 9123)
@@ -46,7 +46,7 @@
         self.__enabled = {}
         self.__voffset = {}
 
-        self.__isMultiline = (self.__style == 'multiline')
+        self.__is_multiline = (self.__style == 'multiline')
         self.__focusIndex = None
 
         self.__cursor = (0, 0)
@@ -171,7 +171,7 @@
         if self.__style in ['checkbox', 'listbox']:
             return
 
-        if self.__isMultiline:
+        if self.__is_multiline:
             if position == 0 or self.__value[index] is None:
                 self.__offset[index]  = 0
                 self.__voffset[index] = 0
@@ -319,7 +319,7 @@
 
             self._parent.move(self.left, self.top + self.__pindex[index] - 1)
 
-        elif self.__isMultiline:
+        elif self.__is_multiline:
             # Create all visible, empty lines
             gDebug(2, "LEN: %s, H: %s" % (self.width, self.height))
             data    = [''.ljust(self.width)] * self.height
@@ -482,8 +482,15 @@
         if self.__style != 'checkbox':
             label = getattr(self._gfObject, 'label', '')
 
+        stretch = self.stretch
+        # Only stretch entries if they're in a horizontal container or if they
+        # are multiline edits
+        if self.getParent()._gfObject._type in ['GFVBox', 'GFPage']:
+            if not self.__is_multiline:
+                stretch = 0
+
         result = (self.min_width or 20, self.min_height or 1, len(label),
-                self.stretch)
+                stretch)
         gLeave(2, result)
         return result