From 8265f1ce81b65233055e4ca19d8abb0ef77f57fe Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 22 Feb 2010 08:55:48 +0000 Subject: [PATCH] Changed VPanel caption height measurement from captionNode to captionWrapper element (allowing more flexibility in themeing). svn changeset:11448/svn branch:6.3 --- src/com/vaadin/terminal/gwt/client/ui/VPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java index f9da8f67d9..85ad8399c2 100644 --- 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) { -- 2.39.5