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

[johannes]

Author: johannes
Date: 2006-12-20 07:03:04 -0600 (Wed, 20 Dec 2006)
New Revision: 9182

Modified:
   trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/grid.py
Log:
Properly shrink grids on resize


Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-12-20 
09:16:17 UTC (rev 9181)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-12-20 
13:03:04 UTC (rev 9182)
@@ -197,8 +197,9 @@
         self.width = width
         self.height = height
 
-        for widget in self.widgets:
-            widget._repaint_()
+        count = min(len(self.widgets), getattr(self._gfObject, '_rows', 0))
+        for index in range(count):
+            self.widgets[index]._repaint_()
 
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-12-20 
09:16:17 UTC (rev 9181)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-12-20 
13:03:04 UTC (rev 9182)
@@ -281,8 +281,6 @@
         Create the window for the form and 
         """
 
-        gEnter(2)
-
         (x, y) = self._uiDriver.screen_size()
         self.__window = curses.newpad(y, x)
         self.__window.keypad(1)
@@ -299,8 +297,6 @@
             child.set_size_and_fit(right-left, bottom-top)
             pages_ok &= child.enough_space
 
-        gDebug(2, "Pages OK: %s" % pages_ok)
-
         try:
             self.__update_page_list()
             self.__update_status_bar()

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/grid.py       2006-12-20 
09:16:17 UTC (rev 9181)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/grid.py       2006-12-20 
13:03:04 UTC (rev 9182)
@@ -85,16 +85,18 @@
         # The header rows are not available to the grid's children
         i_height = num_recs = height - len(self._children)
 
-        self._repaint_()
-
         if num_recs > self.__visible:
             self.__add_new_records(num_recs - self.__visible)
+            gDebug(2, "ROWS: %s" % self.__visible)
             self._gfObject._event_rows_changed(self.__visible)
 
         elif num_recs < self.__visible:
             self.__hide_records(self.__visible - num_recs)
+            gDebug(2, "ROWS: %s" % self.__visible)
             self._gfObject._event_rows_changed(self.__visible)
 
+        self._repaint_()
+
         for (row, child) in enumerate(self._children):
             child.left = self.left
             child.top = self.top + row
@@ -113,7 +115,7 @@
             hints.append(child.get_size_hints())
 
         minw = max([i[0] for i in hints])
-        minh = len(self._children) + self.__visible + 1
+        minh = len(self._children) + self._gfObject.rows + 1
 
         return (minw, minh, 0, self.stretch)