1.1 --- a/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/RegionResizeHandler.java	Tue Mar 27 00:35:15 2007 +0000
     1.2 +++ b/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/RegionResizeHandler.java	Tue Mar 27 01:12:08 2007 +0000
     1.3 @@ -89,7 +89,10 @@
     1.4          int boundary = RegionUtilities.MIN_REGION_WIDTH;
     1.5          int minimumResizerEdge = 0;
     1.6          if (minimumEdgeResizer != null) {
     1.7 -            minimumResizerEdge = minimumEdgeResizer.getLocation().x + RegionUtilities.RESIZER_WIDTH;
     1.8 +            minimumResizerEdge = 
     1.9 +                    minimumEdgeResizer.getLocation().x + 
    1.10 +                    RegionUtilities.RESIZER_WIDTH + 
    1.11 +                    RegionUtilities.HORIZONTAL_LEFT_WIDGET_GAP;
    1.12              boundary += minimumResizerEdge;
    1.13          }
    1.14          // When we move the resizer to the left, child nodes that the resizer
    1.15 @@ -228,14 +231,16 @@
    1.16              Rectangle childRect = new Rectangle(
    1.17                      child.getLocation(), 
    1.18                      child.getBounds().getSize());
    1.19 -            childRect.width += RegionUtilities.HORIZONTAL_EXPANSION_GAP;
    1.20 +            childRect.width += RegionUtilities.HORIZONTAL_RIGHT_WIDGET_GAP;
    1.21              Point originalChildLocation = mOriginalChildWidgetLocationMap.get(child);
    1.22  
    1.23              Point childEdgeLocation = new Point(
    1.24                      resizerRect.x - child.getBounds().width, 
    1.25                      child.getLocation().y);
    1.26 -            childEdgeLocation.x -= RegionUtilities.HORIZONTAL_EXPANSION_GAP;
    1.27 -            childEdgeLocation.x = childEdgeLocation.x < 0 ? 0 : childEdgeLocation.x;
    1.28 +            childEdgeLocation.x -= RegionUtilities.HORIZONTAL_RIGHT_WIDGET_GAP;
    1.29 +            childEdgeLocation.x = childEdgeLocation.x < RegionUtilities.HORIZONTAL_LEFT_WIDGET_GAP ? 
    1.30 +                RegionUtilities.HORIZONTAL_LEFT_WIDGET_GAP : 
    1.31 +                childEdgeLocation.x;
    1.32              
    1.33              if (childRect.intersects(resizerRect)) {
    1.34                  // Move child left.

     2.1 --- a/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/RegionUtilities.java	Tue Mar 27 00:35:15 2007 +0000
     2.2 +++ b/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/RegionUtilities.java	Tue Mar 27 01:12:08 2007 +0000
     2.3 @@ -59,9 +59,13 @@
     2.4      
     2.5      // The number of pixels of extra space that should exist between
     2.6      // a widget and it's region's right border.
     2.7 -    public static final int HORIZONTAL_EXPANSION_GAP = 10;
     2.8 +    public static final int HORIZONTAL_RIGHT_WIDGET_GAP = 10;
     2.9      
    2.10      // The number of pixels of extra space that should exist between
    2.11 +    // a widget and it's region's left border.
    2.12 +    public static final int HORIZONTAL_LEFT_WIDGET_GAP = 30;
    2.13 +
    2.14 +    // The number of pixels of extra space that should exist between
    2.15      // a widget and the bottom of the scene.
    2.16      public static final int VERTICAL_EXPANSION_GAP   = 60;
    2.17      
    2.18 @@ -163,7 +167,7 @@
    2.19                  return;
    2.20              }
    2.21              
    2.22 -            int maxRightRegionXSpan  = findMaximumWidgetXSpan(HORIZONTAL_EXPANSION_GAP, rightRegion);
    2.23 +            int maxRightRegionXSpan  = findMaximumWidgetXSpan(HORIZONTAL_RIGHT_WIDGET_GAP, rightRegion);
    2.24              
    2.25              // The left and middle regions expand only enough to fit their widgets.
    2.26              int leftWidth   = leftRegion.getPreferredBounds().width;

     3.1 --- a/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/layout/CasaCollisionCollector.java	Tue Mar 27 00:35:15 2007 +0000
     3.2 +++ b/compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/layout/CasaCollisionCollector.java	Tue Mar 27 01:12:08 2007 +0000
     3.3 @@ -46,8 +46,8 @@
     3.4   */
     3.5  public class CasaCollisionCollector {
     3.6  
     3.7 -    private static final int SPACING_EDGE = 8;
     3.8 -    private static final int SPACING_NODE = 16;
     3.9 +    private static final int SPACING_EDGE = 4;
    3.10 +    private static final int SPACING_NODE = 6;
    3.11      private LayerWidget[] layers;
    3.12  
    3.13