Don't require passing a constraints namespace to layout helpers.

enable/layout/layout_helpers.py

@@ -1234,6 +1234,7 @@ def horizontal(*items, **config):
     abutments for the given sequence of items.
 
     """
+    items = [item.constraints for item in items]
     return AbutmentHelper('horizontal', *items, **config)
 
 
@@ -1242,6 +1243,7 @@ def vertical(*items, **config):
     abutments for the given sequence of items.
 
     """
+    items = [item.constraints for item in items]
     return AbutmentHelper('vertical', *items, **config)
 
 
@@ -1250,6 +1252,7 @@ def hbox(*items, **config):
     abutments for a given sequence of items.
 
     """
+    items = [item.constraints for item in items]
     return LinearBoxHelper('horizontal', *items, **config)
 
 
@@ -1258,6 +1261,7 @@ def vbox(*items, **config):
     for a given sequence of items.
 
     """
+    items = [item.constraints for item in items]
     return LinearBoxHelper('vertical', *items, **config)
 
 
@@ -1266,6 +1270,7 @@ def align(anchor, *items, **config):
     spacing is allowed.
 
     """
+    items = [item.constraints for item in items]
     return AlignmentHelper(anchor, *items, **config)
 
 
@@ -1274,6 +1279,7 @@ def grid(*rows, **config):
     grid.
 
     """
+    rows = [[item.constraints for item in items] for items in rows]
     return GridHelper(*rows, **config)
 
 

examples/enable/constraints_demo.py

@@ -1,6 +1,6 @@
 
 from enable.api import Component, ComponentEditor, ConstraintsContainer
-from enable.layout.layout_helpers import hbox, vbox, align, grid, horizontal
+from enable.layout.layout_helpers import hbox, vbox, align, grid, vertical
 from traits.api import HasTraits, Any, Instance, List, Property
 from traitsui.api import Item, View, HGroup, TabularEditor
 from traitsui.tabular_adapter import TabularAdapter
@@ -55,12 +55,9 @@ def _canvas_default(self):
 
         parent.add(one, two, three, four)
         parent.layout_constraints = [
-            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),
+            grid([one, two], [three, four]),
+            align('height', one, two, three, four),
+            align('width', one, two, three, four),
         ]
 
         return parent