Changeset 4798 for branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java

Timestamp:

06/09/08 07:23:42 (6 months ago)

Author:

magi@…

Message:

Merged [4771] from trunk to 5.2 branch: Fixed multiple bugs in ProgressIndicator?: polled even if disabled or invisible (#1581), had no isIndeterminate(), did not call requestRepaint() when changing polling interval or indeterminate mode.

Files:

• branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java (modified) (2 diffs)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java

@@ -42 +42 @@
         indeterminate = uidl.getBooleanAttribute("indeterminate");
 
+        String style = CLASSNAME;
+        if (uidl.getBooleanAttribute("disabled")) {
+            style += "-disabled";
+        }
+
         if (indeterminate) {
-            this.setStyleName(CLASSNAME + "-indeterminate");
+            this.setStyleName(style + "-indeterminate");
         } else {
+            setStyleName(style);
             try {
                 final float f = Float.parseFloat(uidl
@@ -53 +59 @@
             }
         }
-        poller.scheduleRepeating(uidl.getIntAttribute("pollinginterval"));
+
+        if (!uidl.getBooleanAttribute("disabled")) {
+            poller.scheduleRepeating(uidl.getIntAttribute("pollinginterval"));
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        if (!visible) {
+            poller.cancel();
+        }
     }