summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorJohn Alhroos <john.ahlroos@itmill.com>2011-10-06 09:32:36 +0000
committerJohn Alhroos <john.ahlroos@itmill.com>2011-10-06 09:32:36 +0000
commit966ed9f9c3225cf6afbee633ebd03d81d5527d97 (patch)
tree0f36f2d5c60561a85071779dcbf7574948f43266 /src/com/vaadin
parent5555625a0635637994bd8b7d4afaa95b388fedb6 (diff)
downloadvaadin-framework-966ed9f9c3225cf6afbee633ebd03d81d5527d97.tar.gz
vaadin-framework-966ed9f9c3225cf6afbee633ebd03d81d5527d97.zip
Fixes footer miscalculation issue #3710
svn changeset:21596/svn branch:6.7
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VForm.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
index 7debc5fe9b..18e0a3790d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
@@ -300,9 +300,9 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler {
@Override
public void setWidth(String width) {
- if (borderPaddingHorizontal < 0) {
+ if (borderPaddingHorizontal < 0 && desc.hasParentElement()) {
// measure excess size lazily after stylename setting, but before
- // setting width
+ // setting width if description is attached
int ow = getOffsetWidth();
int dow = desc.getOffsetWidth();
borderPaddingHorizontal = ow - dow;