Undo the constraints helper simplification for the meantime.

enthought · Jun 25, 2014 · 9650b41 · 9650b41
1 parent f97d88b
commit 9650b41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/enable/layout/layout_helpers.py b/enable/layout/layout_helpers.py
@@ -1234,7 +1234,6 @@ def horizontal(*items, **config):
     abutments for the given sequence of items.
 
     """
-    items = [item.constraints for item in items]
     return AbutmentHelper('horizontal', *items, **config)
 
 
@@ -1243,7 +1242,6 @@ def vertical(*items, **config):
     abutments for the given sequence of items.
 
     """
-    items = [item.constraints for item in items]
     return AbutmentHelper('vertical', *items, **config)
 
 
@@ -1252,7 +1250,6 @@ def hbox(*items, **config):
     abutments for a given sequence of items.
 
     """
-    items = [item.constraints for item in items]
     return LinearBoxHelper('horizontal', *items, **config)
 
 
@@ -1261,7 +1258,6 @@ def vbox(*items, **config):
     for a given sequence of items.
 
     """
-    items = [item.constraints for item in items]
     return LinearBoxHelper('vertical', *items, **config)
 
 
@@ -1270,7 +1266,6 @@ def align(anchor, *items, **config):
     spacing is allowed.
 
     """
-    items = [item.constraints for item in items]
     return AlignmentHelper(anchor, *items, **config)
 
 
@@ -1279,7 +1274,6 @@ def grid(*rows, **config):
     grid.
 
     """
-    rows = [[item.constraints for item in items] for items in rows]
     return GridHelper(*rows, **config)
 
 

diff --git a/examples/enable/constraints_demo.py b/examples/enable/constraints_demo.py
@@ -55,9 +55,12 @@ def _canvas_default(self):
 
         parent.add(one, two, three, four)
         parent.layout_constraints = [
-            grid([one, two], [three, four]),
-            align('height', one, two, three, four),
-            align('width', one, two, three, four),
+            grid([one.constraints, two.constraints],
+                 [three.constraints, four.constraints]),
+            align('height', one.constraints, two.constraints,
+                  three.constraints, four.constraints),
+            align('width', one.constraints, two.constraints,
+                  three.constraints, four.constraints),
         ]
 
         return parent