Put margin on caption's parent so caption's outer size can be used

diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
index 32cf9cfb2e6d72987bb6b2b553d1211388469008..a8512762f1859c106330440ae959ff9368632681 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
@@ -185,11 +185,12 @@ public class PanelConnector extends AbstractComponentContainerConnector
         VPanel panel = getWidget();
 
         LayoutManager layoutManager = getLayoutManager();
-        int top = layoutManager.getInnerHeight(panel.captionNode);
+        int top = layoutManager.getOuterHeight(panel.captionNode);
         int bottom = layoutManager.getInnerHeight(panel.bottomDecoration);
 
         Style style = panel.getElement().getStyle();
-        panel.captionNode.getStyle().setMarginTop(-top, Unit.PX);
+        panel.captionNode.getParentElement().getStyle()
+                .setMarginTop(-top, Unit.PX);
         panel.bottomDecoration.getStyle().setMarginBottom(-bottom, Unit.PX);
         style.setPaddingTop(top, Unit.PX);
         style.setPaddingBottom(bottom, Unit.PX);