From 7cde7dfdc5961f3cf22e37ce09656783d39409b9 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 18 Dec 2008 12:43:48 +0000 Subject: [PATCH] Fix for #2348 - Disable caption when component is disabled svn changeset:6272/svn branch:trunk --- src/com/itmill/toolkit/terminal/gwt/client/ICaption.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java b/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java index b2d00ca672..9450579709 100644 --- 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)) { -- 2.39.5