Properly disable combobox when parent is disabled (#10734)

Change-Id: I3fc238b684d213f509b136d520e67920cb6ed1a4

1 files changed, 7 insertions, 3 deletions

diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index d9eac91e2b..f91ff9e2b9 100644
--- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -50,9 +50,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
         getWidget().paintableId = uidl.getId();
 
         getWidget().readonly = isReadOnly();
-        getWidget().enabled = isEnabled();
-
-        getWidget().tb.setEnabled(getWidget().enabled);
         getWidget().updateReadOnly();
 
         if (!isRealUpdate(uidl)) {
@@ -280,4 +277,11 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
             widget.updateRootWidth();
         }
     }
+
+    @Override
+    public void setWidgetEnabled(boolean widgetEnabled) {
+        super.setWidgetEnabled(widgetEnabled);
+        getWidget().enabled = widgetEnabled;
+        getWidget().tb.setEnabled(widgetEnabled);
+    }
 }