Changed VPanel caption height measurement from captionNode to captionWrapper element...

svn changeset:11448/svn branch:6.3

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index f9da8f67d953e5665aaae3247f222941bf50c3ea..85ad8399c2dc3541c4b9f99686f79ca40376011f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -393,7 +393,8 @@ public class VPanel extends SimplePanel implements Container {
         super.setHeight(height);
         if (height != null && height != "") {
             final int targetHeight = getOffsetHeight();
-            int containerHeight = targetHeight - captionNode.getOffsetHeight()
+            int containerHeight = targetHeight
+                    - captionNode.getParentElement().getOffsetHeight()
                     - bottomDecoration.getOffsetHeight()
                     - getContainerBorderHeight();
             if (containerHeight < 0) {