Added outer layout alignment controls to better test #1710 and #1872

svn changeset:5004/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
index dd526d796286b9753c92cadeefafea75cfe0a5a5..f9e692f77108020bc79e9dad4e9d49574a502d17 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
@@ -209,9 +209,6 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
             internalLayout.addComponent(testedLayout);\r
             internalLayout.setMargin(true);\r
             internalLayout.setSpacing(true);\r
-            internalLayout.setComponentAlignment(testedLayout,\r
-                    OrderedLayout.ALIGNMENT_HORIZONTAL_CENTER,\r
-                    OrderedLayout.ALIGNMENT_VERTICAL_CENTER);\r
 \r
             controls.setWidth(100, OrderedLayout.UNITS_PERCENTAGE);\r
             controls.setStyleName("controls");\r
@@ -266,9 +263,11 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
 \r
             final NativeSelect vAlign = new NativeSelect();\r
             final NativeSelect hAlign = new NativeSelect();\r
-            controls.addComponent(new Label("alignment"));\r
+            controls.addComponent(new Label("component alignment"));\r
             controls.addComponent(hAlign);\r
             controls.addComponent(vAlign);\r
+            hAlign.setNullSelectionAllowed(false);\r
+            vAlign.setNullSelectionAllowed(false);\r
 \r
             vAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_TOP));\r
             vAlign.setItemCaption(new Integer(\r
@@ -313,6 +312,31 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
             hAlign.addListener(alignmentChangeListener);\r
             vAlign.setValue(new Integer(Layout.AlignmentHandler.ALIGNMENT_TOP));\r
 \r
+            controls.addComponent(new Label("layout alignment"));\r
+            final NativeSelect lAlign = new NativeSelect();\r
+            controls.addComponent(lAlign);\r
+            lAlign.setNullSelectionAllowed(false);\r
+            lAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_LEFT));\r
+            lAlign.setItemCaption(new Integer(\r
+                    Layout.AlignmentHandler.ALIGNMENT_LEFT), "left");\r
+            lAlign.addItem(new Integer(\r
+                    Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER));\r
+            lAlign.setItemCaption(new Integer(\r
+                    Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER),\r
+                    "center");\r
+            lAlign\r
+                    .addItem(new Integer(\r
+                            Layout.AlignmentHandler.ALIGNMENT_RIGHT));\r
+            lAlign.setItemCaption(new Integer(\r
+                    Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right");\r
+\r
+            lAlign.addListener(new Property.ValueChangeListener() {\r
+                public void valueChange(ValueChangeEvent event) {\r
+                    internalLayout.setComponentAlignment(testedLayout,\r
+                            ((Integer) lAlign.getValue()).intValue(),\r
+                            OrderedLayout.ALIGNMENT_TOP);\r
+                }\r
+            });\r
         }\r
 \r
         private void updateAlignments(int h, int v) {\r