summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-02-28 09:09:11 +0200
committerLeif Åstrand <leif@vaadin.com>2012-02-28 15:03:59 +0200
commitd8558015efd7ee3feb8f3987fda300c2edafb842 (patch)
tree981d0c74902f87180d75acc10dfd7bb1d9e10ccf
parent75cefcf9c4cb7de9d4142c632efb3c9036889ea3 (diff)
downloadvaadin-framework-d8558015efd7ee3feb8f3987fda300c2edafb842.tar.gz
vaadin-framework-d8558015efd7ee3feb8f3987fda300c2edafb842.zip
Enable changing size back to undefined (#8304)
-rw-r--r--src/com/vaadin/ui/AbstractComponent.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 757eedfe2a..1757c6a7d9 100644
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -775,7 +775,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource
// related code has been updated
if (getIcon() != null) {
target.addAttribute(
- AbstractComponentConnector.ATTRIBUTE_ICON, getIcon());
+ AbstractComponentConnector.ATTRIBUTE_ICON,
+ getIcon());
}
if (eventIdentifiers != null) {
@@ -868,12 +869,16 @@ public abstract class AbstractComponent implements Component, MethodEventSource
&& (getHeightUnits() != Unit.PERCENTAGE || ComponentSizeValidator
.parentCanDefineHeight(this))) {
sharedState.setHeight("" + getCSSHeight());
+ } else {
+ sharedState.setHeight("");
}
if (getWidth() >= 0
&& (getWidthUnits() != Unit.PERCENTAGE || ComponentSizeValidator
.parentCanDefineWidth(this))) {
sharedState.setWidth("" + getCSSWidth());
+ } else {
+ sharedState.setWidth("");
}
sharedState.setImmediate(isImmediate());