Fixed some BoxLayout issues

diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
index 0ed0d4088877e24e7ee4c64dc5d4e8ebb5398f15..bbfad98582aecbb48d20a1b4b8115cc66dd144ce 100644 (file)
--- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
+++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
@@ -42,8 +42,9 @@ TODO
 /* Clear any floats inside the slot, to prevent unwanted collapsing */
 .v-slot:after {
        content: "";
-       display: block;
+       display: inline-block;
        clear: both;
+       width: 0;
        height: 0;
        overflow: hidden;
 }
@@ -51,6 +52,7 @@ TODO
 .v-vertical > .v-slot,
 .v-vertical > .v-expand > .v-slot {
        display: block;
+       clear: both;
 }
 
 .v-horizontal > .v-slot,
@@ -61,6 +63,8 @@ TODO
 .v-vertical > .v-spacing,
 .v-vertical > .v-expand > .v-spacing {
        width: 0;
+       display: block;
+       clear: both;
 }
 
 .v-horizontal > .v-spacing,
@@ -81,21 +85,21 @@ TODO
 
 .v-align-middle,
 .v-align-bottom {
-       white-space: nowrap;;
+       white-space: nowrap;
 }
 
-.v-align-middle > .v-paintable,
-.v-align-bottom > .v-paintable {
+.v-align-middle > .v-connector,
+.v-align-bottom > .v-connector {
        display: inline-block;
        /* TODO this is a bit tricky, since it will override component defaults in some cases */
        white-space: normal;
 }
 
-.v-align-middle > .v-paintable {
+.v-align-middle > .v-connector {
        vertical-align: middle;
 }
 
-.v-align-bottom > .v-paintable {
+.v-align-bottom > .v-connector {
        vertical-align: bottom;
 }
 
@@ -103,7 +107,7 @@ TODO
        text-align: center;
 }
 
-.v-align-center > .v-paintable {
+.v-align-center > .v-connector {
        margin-left: auto;
        margin-right: auto;
 }
@@ -112,7 +116,7 @@ TODO
        text-align: right;
 }
 
-.v-align-right > .v-paintable {
+.v-align-right > .v-connector {
        margin-left: auto;
 }
 
@@ -144,19 +148,19 @@ TODO
        padding-left: .5em;
 }
 
-.v-caption-on-left > .v-paintable,
-.v-caption-on-right > .v-paintable {
+.v-caption-on-left > .v-connector,
+.v-caption-on-right > .v-connector {
        display: inline-block;
        vertical-align: middle;
        /* TODO this is a bit tricky, since it will override component defaults in some cases */
        white-space: normal;
 }
 
-.v-has-caption.v-has-width > .v-paintable {
+.v-has-caption.v-has-width > .v-connector {
        width: 100% !important;
 }
 
-.v-has-caption.v-has-height > .v-paintable {
+.v-has-caption.v-has-height > .v-connector {
        height: 100% !important;
 }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
index 28b1a21230114de94be4362b28d014f9c3a4cfdb..8f9980bf5ad8cad6e2f9762c2a6776631d0b844f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
@@ -239,7 +239,7 @@ public class VBoxLayout extends FlowPanel {
                 if (caption == null) {
                     caption = DOM.createDiv();
                     captionWrap = DOM.createDiv();
-                    captionWrap.addClassName("v-paintable");
+                    captionWrap.addClassName("v-connector");
                     captionWrap.addClassName("v-has-caption");
                     getElement().appendChild(captionWrap);
                     captionWrap.appendChild(getWidget().getElement());