Changeset 4808

Timestamp:

06/09/08 09:52:04 (4 months ago)

Author:

magi@…

Message:

Merged [4802] from trunk to 5.2 branch: fixes #1782 (Components should not be moved to new layout when replacing layout)

Location:

branches/5.2

Files:

• WebContent/ITMILL/themes/default/styles.css (modified) (3 diffs)
• build/VERSION.properties (modified) (1 diff)
• src/com/itmill/toolkit/ui/Panel.java (modified) (1 diff)

branches/5.2/WebContent/ITMILL/themes/default/styles.css

@@ -529 +529 @@
         padding-top:15px;
 }
+
 .i-gridlayout-spacing .i-gridlayout-firstcol {
         padding-left: 0;
@@ -820 +821 @@
 }
 
+.i-progressindicator-disabled {
+        background: #dfe2e4 url(progressindicator/img/disabled.gif);
+        height: 9px;
+        border: 1px solid #b6bbbc;
+        overflow: hidden; /* for IE6 */
+}
+
 .i-progressindicator div {
         background: #f7f9f9 url(progressindicator/img/progress.png);
@@ -828 +836 @@
 .i-progressindicator-indeterminate {
         background: #dfe2e4 url(common/img/ajax-loader-medium.gif);
+        height: 16px;
+        width: 16px;
+        overflow: hidden; /* for IE6 */
+}
+.i-progressindicator-disabled-indeterminate {
+        background: #dfe2e4 url(common/img/blank.gif);
         height: 16px;
         width: 16px;

branches/5.2/build/VERSION.properties

@@ -1 @@
-version=5.2.1
+version=5.2.2

branches/5.2/src/com/itmill/toolkit/ui/Panel.java

@@ -109 +109 @@
 
     /**
-     * Sets the layout of the panel. All the components are moved to new layout.
-     * 
-     * @param layout
+     * Sets the layout of the panel.
+     * 
+     * If given layout is null, an OrderedLayout is used as a default.
+     * 
+     * Components from old layout are not moved to new layout by default
+     * (changed in 5.2.2). Use function in Layout interface manually.
+     * 
+     * @param newLayout
      *                the New layout of the panel.
      */
-    public void setLayout(Layout layout) {
+    public void setLayout(Layout newLayout) {
 
         // Only allow non-null layouts
-        if (layout == null) {
-            layout = new OrderedLayout();
+        if (newLayout == null) {
+            newLayout = new OrderedLayout();
             // Force margins by default
-            layout.setMargin(true);
-        }
-
-        if (layout == this.layout) {
+            newLayout.setMargin(true);
+        }
+
+        if (newLayout == layout) {
             // don't set the same layout twice
             return;
         }
 
+        // detach old layout if present
+        if (layout != null) {
+            layout.setParent(null);
+            layout
+                    .removeListener((ComponentContainer.ComponentAttachListener) this);
+            layout
+                    .removeListener((ComponentContainer.ComponentDetachListener) this);
+        }
+
         // Sets the panel to be parent for the layout
-        layout.setParent(this);
-
-        // If panel already contains a layout, move the contents to new one
-        // and detach old layout from the panel
-        if (this.layout != null) {
-            layout.moveComponentsFrom(this.layout);
-            this.layout.setParent(null);
-        }
-
-        // Removes the event listeners from the old layout
-        if (this.layout != null) {
-            this.layout
-                    .removeListener((ComponentContainer.ComponentAttachListener) this);
-            this.layout
-                    .removeListener((ComponentContainer.ComponentDetachListener) this);
-        }
+        newLayout.setParent(this);
 
         // Sets the new layout
-        this.layout = layout;
+        layout = newLayout;
 
         // Adds the event listeners for new layout
-        layout.addListener((ComponentContainer.ComponentAttachListener) this);
-        layout.addListener((ComponentContainer.ComponentDetachListener) this);
+        newLayout
+                .addListener((ComponentContainer.ComponentAttachListener) this);
+        newLayout
+                .addListener((ComponentContainer.ComponentDetachListener) this);
     }