summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-03-02 14:53:58 +0200
committerLeif Åstrand <leif@vaadin.com>2012-03-02 15:18:42 +0200
commit447c23c9e1981111db12148dc03f13019bd49c0b (patch)
treeb38aa88c155b42105b220065e191495a4d44d2a2 /src
parent7ae5f809f7421d3d78aa71cfae4103af79051c2e (diff)
downloadvaadin-framework-447c23c9e1981111db12148dc03f13019bd49c0b.tar.gz
vaadin-framework-447c23c9e1981111db12148dc03f13019bd49c0b.zip
Measure inner height as it isn't affected by margins (#8313)
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 8673ffd93e..d5ed3fcaf3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
@@ -192,8 +192,8 @@ public class PanelConnector extends AbstractComponentContainerConnector
}
LayoutManager layoutManager = getLayoutManager();
- int top = layoutManager.getOuterHeight(panel.captionNode);
- int bottom = layoutManager.getOuterHeight(panel.bottomDecoration);
+ int top = layoutManager.getInnerHeight(panel.captionNode);
+ int bottom = layoutManager.getInnerHeight(panel.bottomDecoration);
Style style = panel.getElement().getStyle();
panel.captionNode.getStyle().setMarginTop(-top, Unit.PX);