Changeset 5252

Timestamp:

08/25/08 08:42:23 (3 months ago)

Author:

artur.signell@…

Message:

Fixed #677 disabling components inside a disabled container

Location:

trunk

Files:

• WebContent/ITMILL/themes/default/common/common.css (modified) (1 diff)
• WebContent/ITMILL/themes/default/styles.css (modified) (1 diff)
• src/com/itmill/toolkit/tests/tickets/Ticket677.java (modified) (2 diffs)
• src/com/itmill/toolkit/ui/AbstractComponent.java (modified) (3 diffs)
• src/com/itmill/toolkit/ui/AbstractComponentContainer.java (modified) (1 diff)

trunk/WebContent/ITMILL/themes/default/common/common.css

@@ -52 +52 @@
         opacity: 0.3;
         filter: Alpha(opacity=30);
+}
+.i-disabled .i-disabled {
+        opacity: 1.0;
 }
 .i-required-field-indicator {

trunk/WebContent/ITMILL/themes/default/styles.css

@@ -176 +176 @@
         opacity: 0.3;
         filter: Alpha(opacity=30);
+}
+.i-disabled .i-disabled {
+        opacity: 1.0;
 }
 .i-required-field-indicator {

trunk/src/com/itmill/toolkit/tests/tickets/Ticket677.java

@@ -51 +51 @@
         panel.addComponent(innerLayout1);
 
-        innerLayout1.addComponent(new TextField(
-                "TextField inside orderedLayout"));
-        innerLayout1.addComponent(new Button("Button inside orderedLayout"));
+        TextField tf = new TextField("TextField inside orderedLayout");
+        tf.setImmediate(true);
+        innerLayout1.addComponent(tf);
+        innerLayout1.addComponent(new Button("Button inside orderedLayout",
+                new ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        System.out.println("Clicked "
+                                + event.getButton().getCaption());
+                    }
+
+                }));
         innerLayout1.addComponent(new Label("Label inside orderedLayout"));
 
@@ -60 +70 @@
         GridLayout innerLayout2 = new GridLayout(3, 3);
         innerLayout2.setSpacing(true);
-        innerLayout2.addComponent(new TextField("TextField inside gridLayout"));
+        tf = new TextField("TextField inside gridLayout");
+        tf.setImmediate(true);
+        innerLayout2.addComponent(tf);
         innerLayout2.addComponent(new Button("Button inside gridLayout"));
         innerLayout2.addComponent(new Label("Label inside gridLayout"));

trunk/src/com/itmill/toolkit/ui/AbstractComponent.java

@@ -59 +59 @@
 
     /**
-     * Is the component enable (its normal usage is allowed).
+     * Is the component enabled (its normal usage is allowed).
      */
     private boolean enabled = true;
+
+    /**
+     * Has the component been disabled by the container
+     */
+    private boolean disabledByContainer = false;
 
     /**
@@ -307 +312 @@
      */
     public boolean isEnabled() {
-        return enabled && isVisible();
+        return enabled && !disabledByContainer && isVisible();
     }
 
@@ -317 +322 @@
         if (this.enabled != enabled) {
             this.enabled = enabled;
+            requestRepaint();
+        }
+    }
+
+    /**
+     * Enable or disable the component by the container. Normally used to
+     * disable the component when the container is disabled without altering the
+     * actual enabled state of the component.
+     * 
+     * @param disabledByContainer
+     *                Should the component be disabled
+     */
+    public void setDisabledByContainer(boolean disabledByContainer) {
+        if (disabledByContainer != this.disabledByContainer) {
+            this.disabledByContainer = disabledByContainer;
             requestRepaint();
         }

trunk/src/com/itmill/toolkit/ui/AbstractComponentContainer.java

@@ -206 +206 @@
     }
 
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+
+        updateComponentDisabledState(!enabled);
+    }
+
+    public void setDisabledByContainer(boolean disabledByContainer) {
+        super.setDisabledByContainer(disabledByContainer);
+
+        updateComponentDisabledState(disabledByContainer);
+    }
+
+    private void updateComponentDisabledState(boolean disabled) {
+        // Update the disabledByContainer state for all subcomponents
+        for (Iterator i = getComponentIterator(); i.hasNext();) {
+            Component c = (Component) i.next();
+            if (c instanceof AbstractComponent) {
+                ((AbstractComponent) c).setDisabledByContainer(disabled);
+            }
+        }
+
+    }
+
 }