2 files changed, 40 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index 5a4704ba2a..ede5e6ab3b 100644
--- a/server/src/com/vaadin/server/Sizeable.java
+++ b/server/src/com/vaadin/server/Sizeable.java
@@ -81,6 +81,12 @@ public interface Sizeable extends Serializable {
     @Deprecated
     public static final Unit UNITS_PERCENTAGE = Unit.PERCENTAGE;
 
+    /**
+     * @deprecated As of 7.3, use instead {@link #setSizeUndefined()},
+     *             {@link #setHeightUndefined()} and
+     *             {@link #setWidthUndefined()}
+     */
+    @Deprecated
     public static final float SIZE_UNDEFINED = -1;
 
     public enum Unit {
@@ -253,4 +259,18 @@ public interface Sizeable extends Serializable {
      */
     public void setSizeUndefined();
 
+    /**
+     * Clears any defined width
+     * 
+     * @since 7.3
+     */
+    public void setWidthUndefined();
+
+    /**
+     * Clears any defined height
+     * 
+     * @since 7.3
+     */
+    public void setHeightUndefined();
+
 }
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index d0406c3eb7..d980c27916 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -825,7 +825,27 @@ public abstract class AbstractComponent extends AbstractClientConnector
      */
     @Override
     public void setSizeUndefined() {
+        setWidthUndefined();
+        setHeightUndefined();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.server.Sizeable#setWidthUndefined()
+     */
+    @Override
+    public void setWidthUndefined() {
         setWidth(-1, Unit.PIXELS);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.server.Sizeable#setHeightUndefined()
+     */
+    @Override
+    public void setHeightUndefined() {
         setHeight(-1, Unit.PIXELS);
     }