diff options
5 files changed, 24 insertions, 18 deletions
diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css index fba94a8edc..0d2f7312fb 100644 --- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css +++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css @@ -1,3 +1,15 @@ +/* THIS IS HERE ONLY BECAUSE WE WANT TO DEFINE IT FIRST, TO MAKE IT EASY TO OVERRIDE */ +.v-connector { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + text-align: left; + display: inline-block; + white-space: normal; +} + +/* Actual AbsoluteLayout styles begin here */ + .v-absolutelayout-wrapper { position: absolute; overflow: hidden; diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css index a16b85fc65..3188d68520 100644 --- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css +++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css @@ -91,8 +91,6 @@ TODO .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-connector { @@ -152,8 +150,6 @@ TODO .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-connector { diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 7af440c735..71b9ad07a5 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -1,6 +1,6 @@ .v-datefield { white-space: nowrap; - float: left; /* Force minimum width */ + display: inline-block; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css index 9d700fd4ee..e69de29bb2 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.css +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -1,7 +0,0 @@ -.v-connector { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - text-align: left; - display: inline-block; -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java index b88c700e04..546c89b330 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java @@ -225,6 +225,8 @@ public abstract class AbstractBoxLayoutConnector extends if (!slot.hasCaption()) { childCaptionElementHeight.remove(child.getWidget().getElement()); } + + updateLayoutHeight(); } @Override @@ -401,14 +403,17 @@ public abstract class AbstractBoxLayoutConnector extends childElementHeight.put(el, getLayoutManager() .getOuterHeight(el)); - // Element captionElement = el.getParentElement() - // .getFirstChildElement().cast(); - // if (captionElement.getClassName().contains("v-caption")) { - // childCaptionElementHeight.put(el, getLayoutManager() - // .getOuterHeight(captionElement)); - // } + Element captionElement = el.getParentElement() + .getFirstChildElement().cast(); + if (captionElement.getClassName().contains("v-caption")) { + childCaptionElementHeight.put(el, getLayoutManager() + .getOuterHeight(captionElement)); + } } + // If no height has been set, use the natural height for the + // component (this is mostly just a precaution so that something + // renders correctly) String h = getWidget().getElement().getStyle().getHeight(); if (h == null || h.equals("")) { int height = getLayoutManager().getOuterHeight( |