diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-10-12 13:28:04 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-10-12 13:28:04 +0000 |
| commit | 63068ff9e905cf61b4bd0b5ab46836e796dd9244 (patch) | |
| tree | 8b29444f42d9896dcbdf8e7ea7e580b6e64366cc /src/com/vaadin | |
| parent | bd0e0ead4918618b96a60b5b16d1e17da7535967 (diff) | |
| download | vaadin-framework-63068ff9e905cf61b4bd0b5ab46836e796dd9244.tar.gz vaadin-framework-63068ff9e905cf61b4bd0b5ab46836e796dd9244.zip | |
Merged #5778 related changes to 6.4 branch
svn changeset:15521/svn branch:6.4
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java index 4813dbcd21..e0a74735b7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java @@ -170,6 +170,11 @@ public class VCssLayout extends SimplePanel implements Paintable, Container { final Paintable child = client.getPaintable(r); if (oldWidgets.contains(child)) { oldWidgets.remove(child); + VCaption vCaption = widgetToCaption.get(child); + if (vCaption != null) { + add(vCaption); + oldWidgets.remove(vCaption); + } } add((Widget) child); |