From 21b33561008c578ecb21ec360706f06f5fb4ecac Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 13 Mar 2008 13:42:59 +0000
Subject: [PATCH] scroll position now correct on page reload

svn changeset:4035/svn branch:trunk
---
 src/com/itmill/toolkit/ui/Table.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index 0ef9951f18..1a1505d8ac 100644
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -1165,6 +1165,9 @@ public class Table extends AbstractSelect implements Action.Container,
                 } else {
                     firstIndex = size() - 1;
                 }
+            } else {
+                // initial load
+                firstToBeRenderedInClient = firstIndex;
             }
             if (size() > 0) {
                 if (rows + firstIndex > size()) {
@@ -1688,8 +1691,10 @@ public class Table extends AbstractSelect implements Action.Container,
         }
         target.addAttribute("cols", cols);
         target.addAttribute("rows", rows);
+
         target.addAttribute("firstrow",
-                (reqFirstRowToPaint >= 0 ? reqFirstRowToPaint : first));
+                (reqFirstRowToPaint >= 0 ? reqFirstRowToPaint
+                        : firstToBeRenderedInClient));
         target.addAttribute("totalrows", total);
         if (pagelen != 0) {
             target.addAttribute("pagelength", pagelen);
@@ -2163,15 +2168,15 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     public boolean addContainerProperty(Object propertyId, Class type,
             Object defaultValue) throws UnsupportedOperationException {
-        
+
         boolean visibleColAdded = false;
         if (!visibleColumns.contains(propertyId)) {
             visibleColumns.add(propertyId);
             visibleColAdded = true;
         }
-        
+
         if (!super.addContainerProperty(propertyId, type, defaultValue)) {
-            if(visibleColAdded) {
+            if (visibleColAdded) {
                 visibleColumns.remove(propertyId);
             }
             return false;
-- 
2.39.5