1 files changed, 16 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java b/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
index ac168d1f9a..cba2a667ca 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
+++ b/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
@@ -30,6 +30,8 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerState;
 public abstract class AbstractColorPickerConnector extends
         AbstractComponentConnector implements ClickHandler {
 
+    private static final String DEFAULT_WIDTH_STYLE = "v-default-caption-width";
+
     @Override
     public ColorPickerState getState() {
         return (ColorPickerState) super.getState();
@@ -59,6 +61,7 @@ public abstract class AbstractColorPickerConnector extends
                 || stateChangeEvent.hasPropertyChanged("showDefaultCaption")) {
 
             setCaption(getCaption());
+            refreshDefaultCaptionStyle();
         }
     }
 
@@ -84,6 +87,19 @@ public abstract class AbstractColorPickerConnector extends
     }
 
     /**
+     * Add/remove default caption style.
+     */
+    protected void refreshDefaultCaptionStyle() {
+        if (getState().showDefaultCaption
+                && (getState().caption == null || getState().caption.isEmpty())
+                && getState().width.isEmpty()) {
+            getWidget().addStyleName(DEFAULT_WIDTH_STYLE);
+        } else {
+            getWidget().removeStyleName(DEFAULT_WIDTH_STYLE);
+        }
+    }
+
+    /**
      * Set caption of the color picker widget.
      * 
      * @param caption