From: John Alhroos <john.ahlroos@itmill.com>
Date: Wed, 5 May 2010 09:15:33 +0000 (+0000)
Subject: Fix for focus lost when selecting a multipage range in the Table.
X-Git-Tag: 6.7.0.beta1~1687
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e206775cb4c2b963ec91c4e05f218935276a884c;p=vaadin-framework.git

Fix for focus lost when selecting a multipage range in the Table.

svn changeset:13051/svn branch:6.4
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index b241f2ac6e..c445aad43c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -799,6 +799,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             focusLastItemInNextRender = false;
         }
 
+        if (focusedRow != null) {
+            setRowFocus(getRenderedRowByKey(focusedRow.getKey()));
+        }
+
         rendering = false;
         headerChangedDuringUpdate = false;
     }
@@ -3931,6 +3935,11 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 // above
                 if (startRow == null) {
                     startRow = (VScrollTableRow) scrollBody.iterator().next();
+                    setRowFocus(endRow);
+                }
+
+                if (endRow == null) {
+                    setRowFocus(startRow);
                 }
 
                 Iterator<Widget> rows = scrollBody.iterator();