Changeset 19205 in svn

Timestamp:

06/03/11 06:47:11 (2 years ago)

Author:

jonatan.kronqvist@…

Message:

Fix for #7027 and #7029 - treetable no longer scrolls on keyboard collapse/expand and doesn't lose focus on expand

Location:

addons/TreeTable/src/com/vaadin/addon/treetable/client/ui

Files:

• VPatchedScrollTable.java (added)
• VTreeTable.java (modified) (8 diffs)

addons/TreeTable/src/com/vaadin/addon/treetable/client/ui/VTreeTable.java

@@ -11 +11 @@
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.addon.treetable.client.ui.VPatchedScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.addon.treetable.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
@@ -16 +17 @@
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel;
-import com.vaadin.terminal.gwt.client.ui.VScrollTable;
-
-public class VTreeTable extends VScrollTable {
+
+public class VTreeTable extends VPatchedScrollTable {
 
     public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci";
@@ -24 +24 @@
     private boolean selectionPending;
     private int colIndexOfHierarchy;
+    private String collapsedRowKey;
 
     @Override
@@ -38 +39 @@
         super.updateFromUIDL(uidl, client);
         if (collapseRequest) {
+            if (collapsedRowKey != null && scrollBody != null) {
+                VScrollTableRow row = getRenderedRowByKey(collapsedRowKey);
+                if (row != null) {
+                    setRowFocus(row);
+                    focus();
+                }
+            }
+
             int scrollPosition2 = widget.getScrollPosition();
             if (scrollPosition != scrollPosition2) {
@@ -50 +59 @@
             // TODO figure out if the row needs to focused at all
 
-            // scrolled to parent by the server, focusedRow is probably the same
+            // scrolled to parent by the server, focusedRow is probably the sam
             // as the first row in view port
-
         }
     }
@@ -61 +69 @@
     }
 
-    class VTreeTableScrollBody extends
-            com.vaadin.terminal.gwt.client.ui.VScrollTable.VScrollTableBody {
+    class VTreeTableScrollBody extends VPatchedScrollTable.VScrollTableBody {
         private int identWidth = -1;
 
@@ -75 +82 @@
 
         class VTreeTableRow extends
-                VScrollTable.VScrollTableBody.VScrollTableRow {
+                VPatchedScrollTable.VScrollTableBody.VScrollTableRow {
 
             private boolean isTreeCellAdded = false;
@@ -299 +306 @@
 
     private void sendToggleCollapsedUpdate(String rowKey) {
+        collapsedRowKey = rowKey;
         collapseRequest = true;
         client.updateVariable(paintableId, "toggleCollapsed", rowKey, true);