[gnue] r10254 - in trunk/gnue-forms: . src/GFObjects

[reinhard]

Author: reinhard
Date: 2010-12-02 14:47:51 -0600 (Thu, 02 Dec 2010)
New Revision: 10254

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Enable scrolling through a grid while the block has no current record.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-02 21:29:40.832000017 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-02 21:46:05.552000046 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py
src/GFObjects/GFEntry.py        
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py
src/GFObjects/GFField.py        
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFField.py
src/GFObjects/GFTabStop.py      
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py
src/uidrivers/wx/widgets/entry.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py

   + src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden

Name: bzr:text-parents
   - src/GFObjects/GFBlock.py   address@hidden
src/GFObjects/GFEntry.py        address@hidden
src/GFObjects/GFField.py        address@hidden

   + 

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-02 20:47:47 UTC (rev 
10253)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-02 20:47:51 UTC (rev 
10254)
@@ -505,17 +505,18 @@
             return
 
         # Jump to another record if necessary
-        self.__scrolling_blocked = True
         jumped = False
-        try:
-            if self._currentRecord < position:
-                self.goto_record(position)
-                jumped = True
-            elif self._currentRecord > position + self._rows -1:
-                self.goto_record(position + self._rows - 1)
-                jumped = True
-        finally:
-            self.__scrolling_blocked = False
+        if self._currentRecord != -1:
+            self.__scrolling_blocked = True
+            try:
+                if self._currentRecord < position:
+                    self.goto_record(position)
+                    jumped = True
+                elif self._currentRecord > position + self._rows -1:
+                    self.goto_record(position + self._rows - 1)
+                    jumped = True
+            finally:
+                self.__scrolling_blocked = False
 
         # And now scroll the entries
         if jumped:
@@ -1534,16 +1535,12 @@
             newRecord = self.__resultset.getRecordNumber()
             newRecordCount = self.__resultset.getRecordCount()
 
-        if new_visible_start is None:
-            new_visible_start = self.__visible_start
-        new_visible_start = max(new_visible_start, newRecord - self._rows + 1)
-        new_visible_start = max(new_visible_start, 0)
-        new_visible_start = min(new_visible_start, newRecord)
+        if new_visible_start is not None:
+            scroll = new_visible_start - self.__visible_start
+            self.__visible_start = new_visible_start
+        else:
+            scroll = 0
 
-        scroll = new_visible_start - self.__visible_start
-
-        self.__visible_start = new_visible_start
-
         # Find out which ui entries to refresh
         if refresh_all:
             # Result set completely changed, refresh everything