From 0d5d3c136c30923f6addfb80d998de292d4850fa Mon Sep 17 00:00:00 2001
From: John Alhroos <john.ahlroos@itmill.com>
Date: Fri, 6 Aug 2010 06:55:03 +0000
Subject: Fix for #5396

svn changeset:14418/svn branch:6.4
---
 src/com/vaadin/terminal/gwt/client/ui/VTree.java | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src/com')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index f5f30d70a8..bec2ed3aca 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -23,7 +23,9 @@ import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
 import com.google.gwt.event.dom.client.KeyPressEvent;
 import com.google.gwt.event.dom.client.KeyPressHandler;
+import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
@@ -1450,11 +1452,23 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
             node.setFocused(true);
         }
 
+        focusedNode = node;
+
         if (node != null && scrollIntoView) {
-            node.scrollIntoView();
+            /*
+             * Delay scrolling the focused node into view if we are still
+             * rendering. #5396
+             */
+            if (!rendering) {
+                node.scrollIntoView();
+            } else {
+                DeferredCommand.addCommand(new Command() {
+                    public void execute() {
+                        focusedNode.scrollIntoView();
+                    }
+                });
+            }
         }
-
-        focusedNode = node;
     }
 
     /**
-- 
cgit v1.2.3