[gnue] r7947 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2005-09-21 09:31:14 -0500 (Wed, 21 Sep 2005)
New Revision: 7947

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Don't focus into the block on jumpRecord[s].


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-09-21 13:43:14 UTC (rev 
7946)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-09-21 14:31:14 UTC (rev 
7947)
@@ -526,25 +526,24 @@
       raise "Invalid record number"
 
     if recordNumber != self._resultSet.getRecordNumber():
-      # Focus out
-      self.processTrigger('PRE-FOCUSOUT')
-      self.processTrigger('POST-FOCUSOUT')
 
+      if self._form._currentEntry._block == self:
+        # Focus out
+        self.processTrigger('PRE-FOCUSOUT')
+        self.processTrigger('POST-FOCUSOUT')
+
       if not self._resultSet.setRecord(recordNumber):
         self._resultSet.lastRecord()
 
-      # Focus in
-      self.processTrigger('PRE-FOCUSIN')
-      self.processTrigger('POST-FOCUSIN')
-
-      if self._form._currentEntry._block != self:
-        self._form.findAndChangeFocus (self)
-      else:
+      if self._form._currentEntry._block == self:
+        # Focus in
+        self.processTrigger('PRE-FOCUSIN')
+        self.processTrigger('POST-FOCUSIN')
+        # Move to correct record in grid
         self._form.findAndChangeFocus (self._form._currentEntry)
+        self._form._instance.updateRecordCounter (self._form)
 
-      self._form._instance.updateRecordCounter (self._form)
 
-
   def jumpRecords(self, adjustment):
     targetRecord = self._resultSet.getRecordNumber() + adjustment
 
@@ -554,7 +553,6 @@
       targetRecord = self._resultSet.getRecordCount()
 
     self.jumpRecord(targetRecord)
-    self._form._instance.updateRecordCounter(self._form)
 
   #
   # processCommit