Changeset 1514 for trunk/src/org/expeditee/items/Dot.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/Dot.java (modified) (2 diffs)

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

@@ -102 +102 @@
                 invalidateFill();
         }
+        
+        @Override
+        public void setAnchorCenterX(Integer anchor) {
+                if (!isLineEnd()) {
+                        super.setAnchorCenterX(anchor);
+                        return;
+                }
+                
+                invalidateFill();
+                invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchoring.setCenterXAnchor(anchor);
+                
+                int oldX = getX();
+                if (anchor != null) {
+                        int centreX = DisplayController.getFramePaintArea().getCentreX();
+                        int alignedToLeft = centreX + anchor;
+                        int alignedToCenter = alignedToLeft - (getBoundsWidth() / 2);
+                        float deltaX = alignedToCenter - oldX;
+                        anchorConnected(AnchorEdgeType.CenterX, deltaX);
+                }
+                
+                invalidateCommonTrait(ItemAppearence.PostMoved);
+                invalidateFill();
+        }
 
         @Override
@@ -142 +167 @@
                 }
 
+                invalidateCommonTrait(ItemAppearence.PostMoved);
+                invalidateFill();
+        }
+        
+        @Override
+        public void setAnchorCenterY(Integer anchor) {
+                if (!isLineEnd()) {
+                        super.setAnchorCenterY(anchor);
+                        return;
+                }
+                invalidateFill();
+                invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchoring.setCenterYAnchor(anchor);
+                
+                int oldY = getY();
+                if (anchor != null) {
+                        int alignedToTop = DisplayController.getFramePaintArea().getCentreY() + anchor;
+                        float alignedToCenter = alignedToTop - (getBoundsHeight() / 2);
+                        float deltaY = alignedToCenter - oldY;
+                        anchorConnected(AnchorEdgeType.CenterY, deltaY);
+                }
+                
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();