diff options
| author | Artur <artur@vaadin.com> | 2017-04-04 13:43:50 +0300 |
|---|---|---|
| committer | Aleksi Hietanen <aleksi@vaadin.com> | 2017-04-04 13:43:50 +0300 |
| commit | 18a0b1e45cea695ac5700ea91c95a26d6accfb5c (patch) | |
| tree | 282668a431f106d1a8c5afe607b37cdd76a650e5 /client | |
| parent | 4c9b6745f098244535bfe065f2d85ae900ed9752 (diff) | |
| download | vaadin-framework-18a0b1e45cea695ac5700ea91c95a26d6accfb5c.tar.gz vaadin-framework-18a0b1e45cea695ac5700ea91c95a26d6accfb5c.zip | |
Correctly set style names for NativeSelect (#9006)
Fixes #9005
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/VNativeSelect.java | 9 | ||||
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java index e39f25f0d8..46df030f95 100644 --- a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java @@ -20,6 +20,7 @@ import java.util.Objects; import com.google.gwt.event.dom.client.HasAllFocusHandlers; import com.google.gwt.user.client.ui.ListBox; import com.vaadin.client.widgets.FocusableFlowPanelComposite; +import com.vaadin.shared.ui.nativeselect.NativeSelectState; /** * The client-side widget for the {@code NativeSelect} component. @@ -35,9 +36,17 @@ public class VNativeSelect extends FocusableFlowPanelComposite * Creates a new {@code VNativeSelect} instance. */ public VNativeSelect() { + setStyleName(NativeSelectState.STYLE_NAME); + getListBox().setStyleName(NativeSelectState.STYLE_NAME + "-select"); getWidget().add(listBox); } + @Override + public void setStylePrimaryName(String style) { + super.setStylePrimaryName(style); + setStylePrimaryName(listBox.getElement(), style); + } + /** * Sets the selected item by its value. If given {@code null}, removes * selection. diff --git a/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java b/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java index 2426996ba4..7d363fbeac 100644 --- a/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java @@ -53,8 +53,6 @@ public class NativeSelectConnector @Override protected void init() { super.init(); - getWidget().getListBox() - .setStyleName(NativeSelectState.STYLE_NAME + "-select"); selectionChangeRegistration = getWidget().getListBox() .addChangeHandler(e -> selectionRpc .select(getWidget().getListBox().getSelectedValue())); |