From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Wed, 2 Jul 2008 10:42:00 +0000 (+0000)
Subject: Added outer layout alignment controls to better test #1710 and #1872
X-Git-Tag: 6.7.0.beta1~4518
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=44f91ddb190c938b18660f6c842dea152796b8e7;p=vaadin-framework.git

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 dd526d7962..f9e692f771 100644
--- 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);
             internalLayout.setMargin(true);
             internalLayout.setSpacing(true);
-            internalLayout.setComponentAlignment(testedLayout,
-                    OrderedLayout.ALIGNMENT_HORIZONTAL_CENTER,
-                    OrderedLayout.ALIGNMENT_VERTICAL_CENTER);
 
             controls.setWidth(100, OrderedLayout.UNITS_PERCENTAGE);
             controls.setStyleName("controls");
@@ -266,9 +263,11 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
 
             final NativeSelect vAlign = new NativeSelect();
             final NativeSelect hAlign = new NativeSelect();
-            controls.addComponent(new Label("alignment"));
+            controls.addComponent(new Label("component alignment"));
             controls.addComponent(hAlign);
             controls.addComponent(vAlign);
+            hAlign.setNullSelectionAllowed(false);
+            vAlign.setNullSelectionAllowed(false);
 
             vAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_TOP));
             vAlign.setItemCaption(new Integer(
@@ -313,6 +312,31 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
             hAlign.addListener(alignmentChangeListener);
             vAlign.setValue(new Integer(Layout.AlignmentHandler.ALIGNMENT_TOP));
 
+            controls.addComponent(new Label("layout alignment"));
+            final NativeSelect lAlign = new NativeSelect();
+            controls.addComponent(lAlign);
+            lAlign.setNullSelectionAllowed(false);
+            lAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_LEFT));
+            lAlign.setItemCaption(new Integer(
+                    Layout.AlignmentHandler.ALIGNMENT_LEFT), "left");
+            lAlign.addItem(new Integer(
+                    Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER));
+            lAlign.setItemCaption(new Integer(
+                    Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER),
+                    "center");
+            lAlign
+                    .addItem(new Integer(
+                            Layout.AlignmentHandler.ALIGNMENT_RIGHT));
+            lAlign.setItemCaption(new Integer(
+                    Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right");
+
+            lAlign.addListener(new Property.ValueChangeListener() {
+                public void valueChange(ValueChangeEvent event) {
+                    internalLayout.setComponentAlignment(testedLayout,
+                            ((Integer) lAlign.getValue()).intValue(),
+                            OrderedLayout.ALIGNMENT_TOP);
+                }
+            });
         }
 
         private void updateAlignments(int h, int v) {