From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 20 Oct 2009 05:30:04 +0000 (+0000)
Subject: fixes #3546 (column collapsing issues via button)
X-Git-Tag: 6.7.0.beta1~2401
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6490b899b2904a634c16c30926ea7b0b347858ad;p=vaadin-framework.git

fixes #3546 (column collapsing issues via button)

svn changeset:9249/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 8da166f1e5..50b34193bd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1446,6 +1446,15 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
                 if (col.hasAttribute("er")) {
                     c.setExpandRatio(col.getFloatAttribute("er"));
                 }
+                if (col.hasAttribute("collapsed")) {
+                    // ensure header is properly removed from parent (case when
+                    // collapsing happens via servers side api)
+                    if (c.isAttached()) {
+                        c.removeFromParent();
+                        headerChangedDuringUpdate = true;
+                    }
+                }
+
             }
             // check for orphaned header cells
             for (Iterator<String> cit = availableCells.keySet().iterator(); cit