Fix for #2348 - Disable caption when component is disabled

svn changeset:6272/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java b/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java
index b2d00ca6720cc0328f856aa032ac7f208cd0eb6c..94505797098cbc0df634259590042f2194089067 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java
@@ -66,8 +66,6 @@ public class ICaption extends HTML {
     public boolean updateCaption(UIDL uidl) {
         setVisible(!uidl.getBooleanAttribute("invisible"));
 
-        setStyleName(getElement(), "i-disabled", uidl.hasAttribute("disabled"));
-
         boolean wasPlacedAfterComponent = placedAfterComponent;
 
         placedAfterComponent = true;
@@ -79,6 +77,11 @@ public class ICaption extends HTML {
                 style += " " + CLASSNAME + "-" + styles[i];
             }
         }
+
+        if (uidl.hasAttribute("disabled")) {
+            style += " " + "i-disabled";
+        }
+
         setStyleName(style);
 
         if (uidl.hasAttribute(ATTRIBUTE_ICON)) {