New testcase for #2021

svn changeset:5315/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
index d560e364e5a91ceea091ce35288d4aefacfd3509..12e2bf28eba9f02c478a0ec3acda02e8c02f7c6d 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
@@ -1,58 +1,139 @@
 package com.itmill.toolkit.tests.tickets;\r
 \r
 import com.itmill.toolkit.Application;\r
+import com.itmill.toolkit.ui.AbstractComponent;\r
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.ExpandLayout;\r
+import com.itmill.toolkit.ui.GridLayout;\r
 import com.itmill.toolkit.ui.Label;\r
+import com.itmill.toolkit.ui.Layout;\r
+import com.itmill.toolkit.ui.OrderedLayout;\r
 import com.itmill.toolkit.ui.Panel;\r
+import com.itmill.toolkit.ui.TextField;\r
 import com.itmill.toolkit.ui.Window;\r
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 import com.itmill.toolkit.ui.Button.ClickListener;\r
 \r
 public class Ticket2021 extends Application {\r
 \r
-    private ExpandLayout layout;\r
+    private TextField tf1, tf2, tf3;\r
+\r
+    private String contents = "This TextField SHOULD FILL the panel and NOT CAUSE any scrollbars to appear in the Panel. Scrollbars SHOULD appear in the TextField AND the whole scrollbars (includinc arrow down) SHOULD be visible.\n\n"\r
+            + ""\r
+            + "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Praesent quis justo. Vivamus nec mi eu libero convallis auctor. Mauris et arcu. Nunc luctus justo. Aenean convallis, odio in vehicula scelerisque, est magna condimentum pede, a aliquam elit eros vitae diam. Phasellus porttitor convallis tellus. Nullam elementum, ligula nec viverra malesuada, risus tortor bibendum dui, eget hendrerit sem enim at massa. Nam eu pede sed nulla congue fermentum. Vestibulum malesuada libero non nunc. Proin rutrum. Fusce erat pede, volutpat vitae, aliquam ut, sagittis vel, augue. Fusce dui pede, convallis nec, accumsan tincidunt, consectetuer ac, purus. Nulla facilisi. Ut nisi. Sed orci risus, lacinia eu, sodales molestie, gravida quis, neque. Vestibulum pharetra ornare elit. Nulla porttitor molestie mauris. Morbi fringilla tellus sed risus. Curabitur varius massa."\r
+            + "Nulla nisi. Sed blandit, ante vitae sagittis volutpat, arcu mauris vehicula risus, vitae posuere felis lectus sit amet purus. Donec nec magna et leo eleifend scelerisque. Suspendisse condimentum pharetra ligula. Curabitur lorem. Pellentesque a augue sit amet enim fermentum placerat. Phasellus ante risus, molestie at, iaculis at, pellentesque non, tellus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus non urna eget risus tempus imperdiet. Integer est diam, sagittis sit amet, posuere sit amet, bibendum sed, lacus. Aenean adipiscing cursus ipsum. Quisque at elit. Vestibulum vitae nunc. Praesent placerat metus viverra lorem. Cras nec elit congue nisi faucibus feugiat. Nam eget mi. Vestibulum condimentum. Nunc nisl ante, cursus in, dictum ac, lobortis rutrum, mi. Nulla eu nisi. In ultricies vehicula magna."\r
+            + "Nunc eros dui, elementum at, ullamcorper eget, varius at, velit. Ut dictum. Cras ullamcorper ante vel tortor. Quisque viverra mauris vulputate quam. Nulla dui. Suspendisse non eros at ipsum faucibus hendrerit. Morbi dignissim pharetra tortor. Etiam malesuada. Mauris lacinia elementum erat. Duis mollis placerat metus. Nunc risus felis, cursus ac, cursus vel, convallis vel, metus. Ut vehicula nibh et nulla. Vivamus id pede. Quisque egestas arcu a ligula. Maecenas vehicula. Quisque sed ligula quis tellus tempus rutrum. Curabitur vel augue sed orci egestas pharetra. Duis pharetra.";\r
 \r
     public void init() {\r
         Window w = new Window(getClass().getSimpleName());\r
+        w.setLayout(new GridLayout(2, 2));\r
         setMainWindow(w);\r
 \r
         Panel p = new Panel();\r
         p.setCaption("ExpandLayout");\r
         p.setWidth(500);\r
         p.setHeight(500);\r
+        p.setLayout(new ExpandLayout());\r
         p.getLayout().setSizeFull();\r
-        layout = new ExpandLayout();\r
-        p.getLayout().addComponent(layout);\r
+\r
         w.getLayout().addComponent(p);\r
 \r
-        createUI(layout);\r
+        tf1 = new TextField();\r
+        tf1.setRows(5);\r
+        tf1.setSizeFull();\r
+        tf1.setValue(contents);\r
+        tf1.setCaption("TextField caption");\r
+        p.getLayout().addComponent(tf1);\r
+\r
+        /*\r
+         * \r
+         * OrderedLayout\r
+         * \r
+         */\r
+\r
+        Panel p2 = new Panel();\r
+        p2.setCaption("OrderedLayout");\r
+        p2.setWidth(500);\r
+        p2.setHeight(500);\r
+        p2.setLayout(new OrderedLayout());\r
+        p2.getLayout().setSizeFull();\r
+\r
+        w.getLayout().addComponent(p2);\r
+\r
+        tf2 = new TextField();\r
+        tf2.setRows(5);\r
+        tf2.setSizeFull();\r
+        tf2.setValue(contents);\r
+        tf2.setCaption("TextField caption");\r
+        p2.getLayout().addComponent(tf2);\r
+\r
+        /*\r
+         * \r
+         * GridLayout\r
+         * \r
+         */\r
+\r
+        Panel p3 = new Panel();\r
+        p3.setCaption("GridLayout");\r
+        p3.setWidth(500);\r
+        p3.setHeight(500);\r
+        // p3.setLayout(new GridLayout());\r
+        p3.getLayout().setSizeFull();\r
+        p3.getLayout().setMargin(false);\r
+\r
+        GridLayout gl = new GridLayout();\r
+        gl.setSizeFull();\r
+        gl.setMargin(false);\r
+        p3.getLayout().addComponent(gl);\r
+        w.getLayout().addComponent(p3);\r
+\r
+        tf3 = new TextField();\r
+        tf3.setRows(5);\r
+        tf3.setSizeFull();\r
+        tf3.setValue(contents);\r
+        tf3.setCaption("TextField caption");\r
+        // p3.getLayout().addComponent(tf3);\r
+        gl.addComponent(tf3);\r
+\r
+        // p = new Panel();\r
+        // p.setCaption("OrderedLayout");\r
+        // p.setWidth(500);\r
+        // p.setHeight(500);\r
+        // p.getLayout().setSizeFull();\r
+        // orderedLayout = new OrderedLayout();\r
+        // p.getLayout().addComponent(orderedLayout);\r
+        // w.getLayout().addComponent(p);\r
+        // createUI(orderedLayout);\r
     }\r
 \r
-    private void createUI(ExpandLayout layout) {\r
+    private void createUI(Layout layout) {\r
         Label l = new Label("Label");\r
         Button b = new Button("Enable/disable caption and watch button move",\r
                 new ClickListener() {\r
 \r
                     public void buttonClick(ClickEvent event) {\r
                         System.out.println("Enable caption");\r
-\r
-                        if (Ticket2021.this.layout.getCaption() == null) {\r
-                            Ticket2021.this.layout\r
-                                    .setCaption("Expand layout caption");\r
+                        AbstractComponent l = tf1;\r
+                        // Layout l = (Layout) event.getButton().getData();\r
+                        if (l.getCaption() == null) {\r
+                            l.setCaption("Expand layout caption");\r
                         } else {\r
-                            Ticket2021.this.layout.setCaption(null);\r
+                            l.setCaption(null);\r
                         }\r
 \r
                     }\r
 \r
                 });\r
+        b.setData(layout);\r
         Label l2 = new Label("This should always be visible");\r
 \r
         layout.addComponent(l);\r
         layout.addComponent(b);\r
         layout.addComponent(l2);\r
 \r
-        layout.expand(l);\r
+        if (layout instanceof ExpandLayout) {\r
+            ((ExpandLayout) layout).expand(l);\r
+\r
+        }\r
     }\r
 }\r