diff options
| author | Denis Anisimov <denis@vaadin.com> | 2015-03-13 10:52:35 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-10 12:21:49 +0000 |
| commit | 4217d7bbc8552e822367fac9d7d3cc9ee48821dd (patch) | |
| tree | a037cd500937e4b55d0b42d92d18e8f6d5905927 /client/src | |
| parent | 7afa802ba1260105493eda183cae58069c2b7a92 (diff) | |
| download | vaadin-framework-4217d7bbc8552e822367fac9d7d3cc9ee48821dd.tar.gz vaadin-framework-4217d7bbc8552e822367fac9d7d3cc9ee48821dd.zip | |
Don't use !important for ColorPicker width in Valo (#17140).
Change-Id: I47feff9c78a39e30233f388b938c7e4e53b52051
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java | 16 |
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 |