Changeset 1514 for trunk/src/org/expeditee/items/Item.java

Timestamp:

03/04/20 11:00:23 (4 years ago)

Author:

bnemhaus

Message:

Anchoring with AnchorCenterX and AnchorCenterY now work correctly with connected shapes.

File:

• trunk/src/org/expeditee/items/Item.java (modified) (2 diffs)

trunk/src/org/expeditee/items/Item.java

@@ -98 +98 @@
         /** Which edge of the window things are anchored to. */
         public enum AnchorEdgeType {
-                None, Left, Right, Top, Bottom
+                None, Left, CenterY, Right, Top, CenterX, Bottom
         }
         
@@ -3925 +3925 @@
                         if (i.isLineEnd()) {
                                 if (delta != null) {
-                                        if ((anchorEdgeType == AnchorEdgeType.Left) || (anchorEdgeType == AnchorEdgeType.Right)) {
-                                                // 'delta' encodes a horizontal (x) move
-                                                if (anchorEdgeType == AnchorEdgeType.Left) {
-                                                        // Processing a Left anchor
-                                                        // => Anything connected that is *not* anchored to the right should be moved by 'delta'
-                                                        if (i.getAnchorRight()==null) {
-                                                                i.setXY(i.getX() + delta, i.getY());
-                                                        }
+                                        switch (anchorEdgeType) {
+                                        case Left:
+                                                // Processing a Left anchor
+                                                // => Anything connected that is *not* anchored to the right or center should be moved by 'delta'
+                                                if (i.getAnchorRight() == null && i.getAnchorCenterX() == null) {
+                                                        i.setXY(i.getX() + delta, i.getY());
                                                 }
-                                                else {
-                                                        // Processing a Right anchor
-                                                        // => Anything connected that is *not* anchored to the left should be moved by 'delta'
-                                                        if (i.getAnchorLeft()==null) {
-                                                                i.setXY(i.getX() + delta, i.getY());
-                                                        }
+                                                break;
+                                        case CenterX:
+                                                // Processing a CenterY anchor
+                                                // => Anything connected that is *not* anchored to the top or bottom should be moved by 'delta'
+                                                if (i.getAnchorTop()==null && i.getAnchorBottom()==null) {
+                                                        i.setXY(i.getX() + delta, i.getY());
                                                 }
-
+                                                break;
+                                        case Right:
+                                                // Processing a Right anchor
+                                                // => Anything connected that is *not* anchored to the left or center should be moved by 'delta'
+                                                if (i.getAnchorLeft()==null && i.getAnchorCenterX() == null) {
+                                                        i.setXY(i.getX() + delta, i.getY());
+                                                }
+                                                break;
+                                        case Top:
+                                                // Processing a Top anchor
+                                                // => Anything connected that is *not* anchored to the bottom or center should be moved by 'delta'
+                                                if (i.getAnchorBottom()==null && i.getAnchorCenterY() == null) {
+                                                        i.setXY(i.getX(), i.getY() + delta);
+                                                }
+                                                break;
+                                        case CenterY:
+                                                // Processing a CenterX anchor
+                                                // => Anything connected that is *not* anchored to the left or right should be moved by 'delta'
+                                                if (i.getAnchorLeft() == null && i.getAnchorRight() == null) {
+                                                        i.setXY(i.getX(), i.getY() + delta);
+                                                }
+                                                break;
+                                        case Bottom:
+                                                // Processing a Bottom anchor
+                                                // => Anything connected that is *not* anchored to the top or center should be moved by 'delta'
+                                                if (i.getAnchorTop()==null && i.getAnchorCenterY() == null) {
+                                                        i.setXY(i.getX(), i.getY() + delta);
+                                                }
+                                                break;
+                                        case None:
+                                        default:
+                                                break;
+                                        
                                         }
-                                        if ((anchorEdgeType == AnchorEdgeType.Top) || (anchorEdgeType == AnchorEdgeType.Bottom)) {
-                                                // 'delta; encodes a vertical (y) move
-                                                if (anchorEdgeType == AnchorEdgeType.Top) {
-                                                        // Processing a Top anchor
-                                                        // => Anything connected that is *not* anchored to the bottom should be moved by 'delta'
-                                                        if (i.getAnchorBottom()==null) {
-                                                                i.setXY(i.getX(), i.getY() + delta);
-                                                        }
-                                                }
-                                                else {
-                                                        // Processing a Bottom anchor
-                                                        // => Anything connected that is *not* anchored to the top should be moved by 'delta'
-                                                        if (i.getAnchorTop()==null) {
-                                                                // must be Bottom
-                                                                //i.setAnchorBottom(null);
-                                                                i.setXY(i.getX(), i.getY() + delta);
-                                                        }
-                                                }
-                                        }               
+//                                      if ((anchorEdgeType == AnchorEdgeType.Left) || (anchorEdgeType == AnchorEdgeType.Right)) {
+//                                              // 'delta' encodes a horizontal (x) move
+//                                              if (anchorEdgeType == AnchorEdgeType.Left) {
+//                                                      // Processing a Left anchor
+//                                                      // => Anything connected that is *not* anchored to the right should be moved by 'delta'
+//                                                      if (i.getAnchorRight()==null) {
+//                                                              i.setXY(i.getX() + delta, i.getY());
+//                                                      }
+//                                              }
+//                                              else {
+//                                                      // Processing a Right anchor
+//                                                      // => Anything connected that is *not* anchored to the left should be moved by 'delta'
+//                                                      if (i.getAnchorLeft()==null) {
+//                                                              i.setXY(i.getX() + delta, i.getY());
+//                                                      }
+//                                              }
+//
+//                                      }
+//                                      if ((anchorEdgeType == AnchorEdgeType.Top) || (anchorEdgeType == AnchorEdgeType.Bottom)) {
+//                                              // 'delta; encodes a vertical (y) move
+//                                              if (anchorEdgeType == AnchorEdgeType.Top) {
+//                                                      // Processing a Top anchor
+//                                                      // => Anything connected that is *not* anchored to the bottom should be moved by 'delta'
+//                                                      if (i.getAnchorBottom()==null) {
+//                                                              i.setXY(i.getX(), i.getY() + delta);
+//                                                      }
+//                                              }
+//                                              else {
+//                                                      // Processing a Bottom anchor
+//                                                      // => Anything connected that is *not* anchored to the top should be moved by 'delta'
+//                                                      if (i.getAnchorTop()==null) {
+//                                                              // must be Bottom
+//                                                              //i.setAnchorBottom(null);
+//                                                              i.setXY(i.getX(), i.getY() + delta);
+//                                                      }
+//                                              }
+//                                      }               
                                 }
                         }