[gnue] r9154 - in trunk/gnue-forms/src: . input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-12-12 14:04:26 -0600 (Tue, 12 Dec 2006)
New Revision: 9154

Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
Log:
Better way of refreshing display.


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-12-12 19:50:37 UTC (rev 9153)
+++ trunk/gnue-forms/src/GFInstance.py  2006-12-12 20:04:26 UTC (rev 9154)
@@ -383,10 +383,6 @@
         if entry is None:
             return
 
-        # If the display will need to be refreshed, then the proxied event
-        # should set this to 1
-        event.refreshDisplay = 0
-
         # Pass off the event to the current entry's event handler
         entry.subEventHandler.dispatchEvent(event)
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
19:50:37 UTC (rev 9153)
+++ trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
20:04:26 UTC (rev 9154)
@@ -98,12 +98,9 @@
     next = allowed.index(self.display) + 1
     if next == len(allowed):
         next = 0
+    self.__set(allowed[next])
 
-    self.display = allowed[next]
-    self.modified = True
-    self.updateFieldValue()
 
-
   # Handle requestTOGGLECHKBOX event
   def handleToggleChkbox (self, event):
     if not self.editing:
@@ -112,7 +109,6 @@
       self.__toggle()
     else:
       self.__set(self.__sanitize_value(event.data[1]))
-    event.refreshDisplay = True
 
 
   def beginEdit(self):
@@ -131,7 +127,6 @@
       self.__set (False)
     elif event.text in ['1', '+']:      # TODO: add "N" for current language
       self.__set (True)
-    event.refreshDisplay = True
     return
 
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
19:50:37 UTC (rev 9153)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
20:04:26 UTC (rev 9154)
@@ -194,7 +194,7 @@
 
         if self._selection1 is not None:
             # If text is selected, then we will replace
-            (start, end) = getSelectionArea()
+            (start, end) = self.getSelectionArea()
         else:
             # Otherwise just graft the new text in place
             (start, end) = (self._cursor, self._cursor)
@@ -211,9 +211,9 @@
         if hasattr(event, 'position'):
             new_cursor = event.position
         else:
-            new_cursor= self._cursor
+            new_cursor = len(event.text)
 
-        self.__change_text(0, len(self.display), event.text, event.position)
+        self.__change_text(0, len(self.display), event.text, new_cursor)
 
   # -------------------------------------------------------------------------
 
@@ -370,7 +370,7 @@
       self._selection1 = None
 
     self._cursor = min(event.position, len(self.display))
-    event.refreshDisplay = True
+    self.generateRefreshEvent()
 
 
   def _moveCursorLeft(self, event, selecting=False):
@@ -386,7 +386,7 @@
 
     if self._cursor > 0:
       self._cursor -= 1
-      event.refreshDisplay = True
+      self.generateRefreshEvent()
 
   def _moveCursorRight(self, event, selecting=False):
     """
@@ -402,7 +402,7 @@
     if self._cursor < len(self.display):
       self._cursor += 1
 
-    event.refreshDisplay = True
+    self.generateRefreshEvent()
 
   def _moveCursorToEnd(self, event, selecting=False):
     """
@@ -416,7 +416,7 @@
       self._selection1 = None
 
     self._cursor = len(self.display)
-    event.refreshDisplay = True
+    self.generateRefreshEvent()
 
 
   def _moveCursorToBegin(self, event, selecting=False):
@@ -431,7 +431,7 @@
       self._selection1 = None
 
     self._cursor = 0
-    event.refreshDisplay = True
+    self.generateRefreshEvent()
 
 
   # ---------------------------------------------------------------------------