Fixed primary stylename handling for ListSelect #9907

Change-Id: Ia717af9a2dd973f16366ee527bf8f3c221fd4403

1 files changed, 18 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/ui/listselect/VListSelect.java b/client/src/com/vaadin/client/ui/listselect/VListSelect.java
index 520995012e..d8d0a43378 100644
--- a/client/src/com/vaadin/client/ui/listselect/VListSelect.java
+++ b/client/src/com/vaadin/client/ui/listselect/VListSelect.java
@@ -39,8 +39,25 @@ public class VListSelect extends VOptionGroupBase {
         select = getOptionsContainer();
         select.addChangeHandler(this);
         select.addClickHandler(this);
-        select.setStyleName(CLASSNAME + "-select");
         select.setVisibleItemCount(VISIBLE_COUNT);
+        setStyleName(CLASSNAME);
+    }
+
+    @Override
+    public void setStyleName(String style) {
+        super.setStyleName(style);
+        updateStyleNames();
+    }
+
+    @Override
+    public void setStylePrimaryName(String style) {
+        super.setStylePrimaryName(style);
+        updateStyleNames();
+    }
+
+    protected void updateStyleNames() {
+        container.setStyleName(getStylePrimaryName());
+        select.setStyleName(getStylePrimaryName() + "-select");
     }
 
     protected ListBox getOptionsContainer() {