Fix for #2563 - OrderedLayout flicker on repaint

Changed Label so it never wraps when its width is undefined. 
Changed default Label width to 100%.


svn changeset:6841/svn branch:trunk

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/itmill/toolkit/ui/Label.java b/src/com/itmill/toolkit/ui/Label.java
index b11f9f5a2e..1a9e497e9c 100644
--- a/src/com/itmill/toolkit/ui/Label.java
+++ b/src/com/itmill/toolkit/ui/Label.java
@@ -101,7 +101,7 @@ public class Label extends AbstractComponent implements Property,
      * Creates an empty Label.
      */
     public Label() {
-        setPropertyDataSource(new ObjectProperty("", String.class));
+        this("");
     }
 
     /**
@@ -110,7 +110,7 @@ public class Label extends AbstractComponent implements Property,
      * @param content
      */
     public Label(String content) {
-        setPropertyDataSource(new ObjectProperty(content, String.class));
+        this(content, CONTENT_DEFAULT);
     }
 
     /**
@@ -120,7 +120,7 @@ public class Label extends AbstractComponent implements Property,
      * @param contentSource
      */
     public Label(Property contentSource) {
-        setPropertyDataSource(contentSource);
+        this(contentSource, CONTENT_DEFAULT);
     }
 
     /**
@@ -130,8 +130,7 @@ public class Label extends AbstractComponent implements Property,
      * @param contentMode
      */
     public Label(String content, int contentMode) {
-        setPropertyDataSource(new ObjectProperty(content, String.class));
-        setContentMode(contentMode);
+        this(new ObjectProperty(content, String.class), contentMode);
     }
 
     /**
@@ -143,7 +142,10 @@ public class Label extends AbstractComponent implements Property,
      */
     public Label(Property contentSource, int contentMode) {
         setPropertyDataSource(contentSource);
-        setContentMode(contentMode);
+        if (contentMode != CONTENT_DEFAULT) {
+            setContentMode(contentMode);
+        }
+        setWidth(100, UNITS_PERCENTAGE);
     }
 
     /**